링크 버그 수정

route/tool/func.py

@@ -226,9 +226,6 @@ def update(ver_num, set_data):
                 '^' + i[0].replace('.', '\\.'),
                 i[0]
             ])
-            
-    if ver_num < 3184400:
-        curs.execute(db_change('delete from cache_data'))
 
     # set 1
     if ver_num < 3190201:
@@ -261,6 +258,9 @@ def update(ver_num, set_data):
                 get_data[2]
             ])
 
+    if ver_num < 3191700:
+        curs.execute(db_change('delete from cache_data'))
+
     conn.commit()
 
     print('Update pass')

route/tool/set_mark/namumark.py

@@ -1075,15 +1075,22 @@ def namumark(conn, data, title, include_num):
 
                     inter_view = inter[0][1] if inter[0][1] != '' else (inter_data[0] + ':')
 
-                    data = link_re.sub('<a id="inside" name="set_link_' + str_e_link_id + '" href="">' + inter_view + see_link + '</a>', data, 1)
+                    data = link_re.sub('' + \
+                        '<a id="inside" ' + \
+                            'name="' + include_name + 'set_link_' + str_e_link_id + '" ' + \
+                            'href="">' + inter_view + see_link + '</a>' + \
+                        '', 
+                        data, 
+                        1
+                    )
                     plus_data += "" + \
-                        "document.getElementsByName('set_link_" + str_e_link_id + "')[0].href = '" + \
+                        "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].href = '" + \
                             (inter[0][0] + tool.url_pas(main_link) + other_link).replace('\'', '\\\'') + "';" + \
                         "\n" + \
                     ""
                     if inter_same == 1:
                         plus_data += "" + \
-                            "document.getElementsByName('set_link_" + str_e_link_id + "')[0].innerHTML = '" + \
+                            "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].innerHTML = '" + \
                                 (inter_view + main_link + other_link).replace('\'', '\\\'') + "';" + \
                             "\n" + \
                         ""
@@ -1098,16 +1105,24 @@ def namumark(conn, data, title, include_num):
                 else:
                     data = link_re.sub('[[' + title + under_title + ']]', data, 1)
             elif re.search(r'^http(s)?:\/\/', main_link):
-                data = link_re.sub('<a id="out_link" name="set_link_' + str_e_link_id + '" rel="nofollow" href="">' + see_link + '</a>', data, 1)
+                data = link_re.sub('' + \
+                    '<a id="out_link" ' + \
+                        'name="' + include_name + 'set_link_' + str_e_link_id + '" ' + \
+                        'rel="nofollow" ' + \
+                        'href="">' + see_link + '</a>' + \
+                    '', 
+                    data, 
+                    1
+                )
 
                 plus_data += "" + \
-                    "document.getElementsByName('set_link_" + str_e_link_id + "')[0].href = '" + \
+                    "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].href = '" + \
                         main_link.replace('\'', '\\\'') + "';" + \
                     "\n" + \
                 ""
                 if inter_same == 1:
                     plus_data += "" + \
-                        "document.getElementsByName('set_link_" + str_e_link_id + "')[0].innerHTML = '" + \
+                        "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].innerHTML = '" + \
                             main_link.replace('\'', '\\\'') + "';" + \
                         "\n" + \
                     ""
@@ -1132,21 +1147,29 @@ def namumark(conn, data, title, include_num):
                     if not curs.fetchall():
                         backlink += [[title, main_link, 'no']]
 
-                    data = link_re.sub('<a class="' + include_name + 'link_finder" name="set_link_' + str_e_link_id + '" title="" href="">' + see_link + '</a>', data, 1)
+                    data = link_re.sub('' + \
+                        '<a class="' + include_name + 'link_finder" ' + \
+                            'name="' + include_name + 'set_link_' + str_e_link_id + '" ' + \
+                            'title="" ' + \
+                            'href="">' + see_link + '</a>' + \
+                        '', 
+                        data,
+                        1
+                    )
 
                     plus_data += "" + \
-                        "document.getElementsByName('set_link_" + str_e_link_id + "')[0].href = '" + \
+                        "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].href = '" + \
                             ('/w/' + tool.url_pas(main_link) + other_link).replace('\'', '\\\'') + "';" + \
                         "\n" + \
                     ""
                     plus_data += "" + \
-                        "document.getElementsByName('set_link_" + str_e_link_id + "')[0].title = '" + \
+                        "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].title = '" + \
                             (html.escape(main_link) + other_link).replace('\'', '\\\'') + "';" + \
                         "\n" + \
                     ""
                     if inter_same == 1:
                         plus_data += "" + \
-                            "document.getElementsByName('set_link_" + str_e_link_id + "')[0].innerHTML = '" + \
+                            "document.getElementsByName('" + include_name + "set_link_" + str_e_link_id + "')[0].innerHTML = '" + \
                                 (html.escape(main_link) + other_link).replace('\'', '\\\'') + "';" + \
                             "\n" + \
                         ""

version.json

@@ -1,7 +1,7 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-16",
-        "c_ver" : "3191301",
+        "r_ver" : "v3.1.9-master-17",
+        "c_ver" : "3191700",
         "s_ver" : "8"
     }, "stable" : {
         "r_ver" : "v3.1.8-stable-06",