2DU 8 лет назад
Родитель
Сommit
aa6fc19025
2 измененных файлов с 27 добавлено и 26 удалено
  1. 19 23
      back_reset.py
  2. 8 3
      mark.py

+ 19 - 23
back_reset.py

@@ -20,26 +20,22 @@ def go_namu(data):
 
 curs.execute("select title, data from data")
 data = curs.fetchall()
-print(int(len(data) / 4))
-l = int(len(data) / 4)
-
-d1 = data[:l]
-d2 = data[l:l * 2]
-d3 = data[l * 2:l * 3]
-d4 = data[l * 3:]
-
-if(__name__=='__main__'):
-    p1 = Process(target = go_namu, args = [d1])
-    p2 = Process(target = go_namu, args = [d2])
-    p3 = Process(target = go_namu, args = [d3])
-    p4 = Process(target = go_namu, args = [d4])
-    p1.start()
-    p2.start()
-    p3.start()
-    p4.start()
-    p1.join()
-    p2.join()
-    p3.join()
-    p4.join()
-    
-conn.commit()
+
+go_namu(data)
+
+#l = int(len(data) / 4)
+
+#d1 = data[:l]
+#d2 = data[l:l * 2]
+#d3 = data[l * 2:l * 3]
+#d4 = data[l * 3:]
+
+#if(__name__=='__main__'):
+#    p1 = Process(target = go_namu, args = [d1])
+#    p2 = Process(target = go_namu, args = [d2])
+#    p3 = Process(target = go_namu, args = [d3])
+#    p4 = Process(target = go_namu, args = [d4])
+#    p1.start()
+#    p2.start()
+#    p3.start()
+#    p4.start()

+ 8 - 3
mark.py

@@ -411,7 +411,8 @@ def toc_pas(data, title, num, toc_y):
 def backlink_plus(name, link, backtype, num):
     if(num == 1):
         curs.execute("select title from back where title = ? and link = ? and type = ?", [link, name, backtype])
-        if(not curs.fetchall()):
+        d = curs.fetchall()
+        if(not d):
             try:
                 curs.execute("insert into back (title, link, type) values (?, ?,  ?)", [link, name, backtype])
             except:
@@ -425,7 +426,8 @@ def backlink_plus(name, link, backtype, num):
 def cat_plus(name, link, num):
     if(num == 1):
         curs.execute("select title from cat where title = ? and cat = ?", [link, name])
-        if(not curs.fetchall()):
+        d = curs.fetchall()
+        if(not d):
             try:
                 curs.execute("insert into cat (title, cat) values (?, ?)", [link, name])
             except:
@@ -995,6 +997,9 @@ def namumark(title, data, num, in_c, toc_y):
     data = re.sub('<hr style="margin-top: -5px;"><br>', '<hr style="margin-top: -5px;">', data)
     data = re.sub('<isbr>', '\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)        
+
+    if(num == 1):
+        conn.commit()
 
     return(data)