틀 렌더링 방법 변경

route/tool/func.py

@@ -201,6 +201,9 @@ def update(ver_num):
         print('Add init set')
         set_init()
 
+    if ver_num < 3160028:
+        curs.execute(db_change('delete from cache_data'))
+
     conn.commit()
     print('Update pass')
     print('----')
@@ -467,7 +470,7 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 14
+    main_css_ver = 15
 
     if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):

route/tool/set_mark/namumark.py

@@ -455,9 +455,7 @@ def namumark(conn, data, title, main_num, include_num):
             break
 
     data = re.sub('\\\\{', '<break_middle>', data)
-    
     data = middle_parser(data, include_num)
-
     data = re.sub('<break_middle>', '\\{', data)
 
     num = 0
@@ -490,35 +488,31 @@ def namumark(conn, data, title, main_num, include_num):
                 include_data = 'Test'
 
             include_link = include_data
-
             backlink += [[title, include_link, 'include']]
 
-            curs.execute(tool.db_change("select title from data where title = ?"), [include_data])
-            if curs.fetchall():
-                data = include_re.sub('' + \
-                    '<a id="include_link" href="/w/' + tool.url_pas(include_link) + '">[' + include_link + ']</a><div id="include_' + str(i) + '"></div>' + \
-                '', data, 1)
+            data = include_re.sub('' + \
+                '<a id="include_link" class="include_' + str(i) + '" href="/w/' + tool.url_pas(include_link) + '">[' + include_link + ']</a>' + \
+                '<div id="include_' + str(i) + '"></div>' + \
+            '', data, 1)
 
-                include_plus_data = []
-                while 1:
-                    include_plus = re.search(', ?((?:(?!=).)+)=((?:(?!,).)+)', include)
-                    if include_plus:
-                        include_plus = include_plus.groups()
+            include_plus_data = []
+            while 1:
+                include_plus = re.search(', ?((?:(?!=).)+)=((?:(?!,).)+)', include)
+                if include_plus:
+                    include_plus = include_plus.groups()
 
-                        include_data_set = include_plus[1]
-                        find_data = re.findall('<span id="(one_nowiki_[0-9]+)">', include_data_set)
-                        for j in find_data:
-                            include_data_set = include_data_set.replace('<span id="' + j + '"></span>', end_data[j][0])
+                    include_data_set = include_plus[1]
+                    find_data = re.findall('<span id="(one_nowiki_[0-9]+)">', include_data_set)
+                    for j in find_data:
+                        include_data_set = include_data_set.replace('<span id="' + j + '"></span>', end_data[j][0])
 
-                        include_plus_data += [[include_plus[0], include_data_set]]
+                    include_plus_data += [[include_plus[0], include_data_set]]
 
-                        include = re.sub(', ?((?:(?!=).)+)=((?:(?!,).)+)', '', include, 1)
-                    else:
-                        break
+                    include = re.sub(', ?((?:(?!=).)+)=((?:(?!,).)+)', '', include, 1)
+                else:
+                    break
 
-                plus_data += '<script>load_include("' + include_link + '", "include_' + str(i) + '", ' + str(include_plus_data) + ');</script>'
-            else:
-                data = include_re.sub('<a id="not_thing" href="/w/' + tool.url_pas(include_link) + '">[' + include_link + ']</a>', data, 1)
+            plus_data += '<script>load_include("' + include_link + '", "include_' + str(i) + '", ' + str(include_plus_data) + ');</script>'
         else:
             break
 

version.json

@@ -1,7 +1,7 @@
 {
     "master" : {
-        "r_ver" : "v3.1.6-master-27",
-        "c_ver" : "3160027",
+        "r_ver" : "v3.1.6-master-28",
+        "c_ver" : "3160028",
         "s_ver" : "7"
     }, "stable" : {
         "r_ver" : "v3.1.5-stable-03",

views/main_css/js/load_namumark.js

@@ -58,16 +58,22 @@ function load_include(title, name, p_data) {
 
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
-            var o_p_data = JSON.parse(this.responseText);
-            var g_data = o_p_data['data'];
+            if(this.responseText === "{}\n") {
+                o_data.innerHTML = "";
 
-            o_data.innerHTML = g_data;
+                document.getElementsByClassName(name)[0].id = "not_thing";
+            } else {
+                var o_p_data = JSON.parse(this.responseText);
+                var g_data = o_p_data['data'];
 
-            js_data = o_p_data['js_data'];
-            js_data = js_data.replace(/<script>/g, '');
-            js_data = js_data.replace(/<\/script>/g, '\n');
+                o_data.innerHTML = g_data;
 
-            eval(js_data)
+                js_data = o_p_data['js_data'];
+                js_data = js_data.replace(/<script>/g, '');
+                js_data = js_data.replace(/<\/script>/g, '\n');
+
+                eval(js_data);
+            }
         }
     }
 }