2DU 8 лет назад
Родитель
Сommit
9370074336
3 измененных файлов с 7 добавлено и 8 удалено
  1. 3 5
      app.py
  2. 3 1
      back_reset.py
  3. 1 2
      mark.py

+ 3 - 5
app.py

@@ -1129,14 +1129,10 @@ def revert(name = None, num = None):
                 row = curs.fetchall()
                 row = curs.fetchall()
                 if(row):
                 if(row):
                     leng = leng_check(len(row[0][0]), len(rows[0][0]))
                     leng = leng_check(len(row[0][0]), len(rows[0][0]))
-                    
                     curs.execute("update data set data = ? where title = ?", [rows[0][0], name])
                     curs.execute("update data set data = ? where title = ?", [rows[0][0], name])
-                    conn.commit()
                 else:
                 else:
                     leng = '+' + str(len(rows[0][0]))
                     leng = '+' + str(len(rows[0][0]))
-                    
                     curs.execute("insert into data (title, data, acl) values (?, ?, '')", [name, rows[0][0]])
                     curs.execute("insert into data (title, data, acl) values (?, ?, '')", [name, rows[0][0]])
-                    conn.commit()
                     
                     
                 history_plus(
                 history_plus(
                     name, 
                     name, 
@@ -1148,6 +1144,8 @@ def revert(name = None, num = None):
                 )
                 )
                 
                 
                 namumark(name, rows[0][0], 1, 0, 0)
                 namumark(name, rows[0][0], 1, 0, 0)
+                conn.commit()
+                
                 return(redirect('/w/' + url_pas(name)))
                 return(redirect('/w/' + url_pas(name)))
     else:
     else:
         curs.execute("select title from hidhi where title = ? and re = ?", [name, str(num)])
         curs.execute("select title from hidhi where title = ? and re = ?", [name, str(num)])
@@ -1296,8 +1294,8 @@ def edit(name = None, num = None):
                 
                 
         namumark(name, content, 1, 0, 0)
         namumark(name, content, 1, 0, 0)
         include_check(name, content)
         include_check(name, content)
-        
         conn.commit()
         conn.commit()
+        
         return(redirect('/w/' + url_pas(name)))
         return(redirect('/w/' + url_pas(name)))
     else:        
     else:        
         if(can == 1):
         if(can == 1):

+ 3 - 1
back_reset.py

@@ -40,4 +40,6 @@ if(__name__=='__main__'):
     p1.join()
     p1.join()
     p2.join()
     p2.join()
     p3.join()
     p3.join()
-    p4.join()
+    p4.join()
+    
+conn.commit()

+ 1 - 2
mark.py

@@ -962,6 +962,5 @@ def namumark(title, data, num, in_c, toc_y):
     data = re.sub('<isbr>', '\r\n', data)
     data = re.sub('<isbr>', '\r\n', data)
     data = re.sub('^(?:<br>|\r|\n| )+', '', data)
     data = re.sub('^(?:<br>|\r|\n| )+', '', data)
     data = re.sub('^<div style="margin-top: 30px;" id="cate">', '<div id="cate">', data)
     data = re.sub('^<div style="margin-top: 30px;" id="cate">', '<div id="cate">', data)
-    
-    conn.commit()
+
     return(data)
     return(data)