2DU 8 years ago
parent
commit
9e872b2fa7
3 changed files with 16 additions and 29 deletions
  1. 13 12
      app.py
  2. 1 16
      mark.py
  3. 2 1
      views/acme/index.tpl

+ 13 - 12
app.py

@@ -205,6 +205,17 @@ try:
     except:
         pass
 
+    try:
+        curs.execute('select title, cat from cat')
+        lo_d = curs.fetchall()
+        for m_lo in lo_d:
+            curs.execute("insert into back (title, link, type) values (?, ?, 'cat')", [m_lo[0], m_lo[1]])
+
+        curs.execute("drop table cat")
+        print('cat 테이블 삭제')
+    except:
+        pass
+
     conn.commit()
 except:
     pass
@@ -259,11 +270,6 @@ def setup():
         except:
             pass
 
-        try:
-            curs.execute("create table cat(title text, cat text)")
-        except:
-            pass
-
         try:
             curs.execute("create table hidhi(title text, re text)")
         except:
@@ -1410,7 +1416,6 @@ def revert(name = None, num = None):
             return(re_error('/ban'))
         else:
             curs.execute("delete from back where link = ?", [name])
-            curs.execute("delete from cat where cat = ?", [name])
             conn.commit()
 
             curs.execute("select data from history where title = ? and id = ?", [name, str(num)])
@@ -1489,7 +1494,6 @@ def m_del():
                 rows = curs.fetchall()
                 if(rows):
                     curs.execute("delete from back where title = ?", [g])
-                    curs.execute("delete from cat where title = ?", [g])
 
                     leng = '-' + str(len(rows[0][0]))
                     curs.execute("delete from data where title = ?", [g])
@@ -1560,7 +1564,6 @@ def edit(name = None, num = None):
         content = savemark(request.forms.content)
 
         curs.execute("delete from back where link = ?", [name])
-        curs.execute("delete from cat where cat = ?", [name])
 
         curs.execute("select data from data where title = ?", [name])
         rows = curs.fetchall()
@@ -1710,7 +1713,6 @@ def delete(name = None):
             history_plus(name, '', today, ip, request.forms.send + ' (삭제)', leng)
             
             curs.execute("delete from back where link = ?", [name])
-            curs.execute("delete from cat where cat = ?", [name])
             curs.execute("delete from data where title = ?", [name])
             conn.commit()
             
@@ -1798,7 +1800,6 @@ def move(name = None):
         if(rows):            
             curs.execute("update data set title = ? where title = ?", [request.forms.title, name])
             curs.execute("update back set link = ? where link = ?", [request.forms.title, name])
-            curs.execute("update cat set cat = ? where cat = ?", [request.forms.title, name])
             
             d = rows[0][0]
         else:
@@ -3267,10 +3268,10 @@ def read_view(name = None, num = None, redirect = None):
         admin_memu = 0
         
     if(re.search("^분류:", name)):
-        curs.execute("delete from cat where title = ? and cat = ''", [name])
+        curs.execute("delete from back where title = ? and type='cat' and link = ''", [name])
         conn.commit()
         
-        curs.execute("select cat from cat where title = ? order by cat asc", [name])
+        curs.execute("select link from back where title = ? and type='cat' order by link asc", [name])
         rows = curs.fetchall()
         if(rows):
             div = '[목차(없음)]\r\n== 분류 ==\r\n'

+ 1 - 16
mark.py

@@ -423,21 +423,6 @@ def backlink_plus(name, link, backtype, num):
                     except:
                         time.sleep(1)
 
-def cat_plus(name, link, num):
-    if(num == 1):
-        curs.execute("select title from cat where title = ? and cat = ?", [link, name])
-        d = curs.fetchall()
-        if(not d):
-            try:
-                curs.execute("insert into cat (title, cat) values (?, ?)", [link, name])
-            except:
-                while(1):
-                    try:
-                        curs.execute("insert into cat (title, cat) values (?, ?)", [link, name])
-                        break
-                    except:
-                        time.sleep(1)
-
 def namumark(title, data, num, in_c, toc_y):    
     data = re.sub("\n", "\r\n", re.sub("\r\n", "\n", data))
     data = html_pas(data)
@@ -538,7 +523,7 @@ def namumark(title, data, num, in_c, toc_y):
             g = m.groups()
             
             if(title != g[0]):
-                cat_plus(title, g[0], num)
+                backlink_plus(title, g[0], num, 'cat')
                     
                 if(category == ''):
                     curs.execute("select title from data where title = ?", [g[0]])

+ 2 - 1
views/acme/index.tpl

@@ -13,7 +13,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/default.min.css">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
         <script>hljs.initHighlightingOnLoad();</script>
-        <link rel="stylesheet" href="/views/yousoro/css/awesome/font-awesome.min.css">
+        <link rel="stylesheet" href="/views/acme/css/awesome/font-awesome.min.css">
         <script type="text/x-mathjax-config">MathJax.Hub.Config({tex2jax: {inlineMath: [['[math]', '[/math]']]}});</script>
         <script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS_CHTML"></script>
         <script src='https://www.google.com/recaptcha/api.js'></script>
@@ -23,6 +23,7 @@
         <meta name="twitter:title" content="{{imp[0]}}">
         <meta name="twitter:site" content="@{{imp[1]}}">
         <meta name="twitter:card" content="summary">
+        <link rel="shortcut icon" href="/views/acme/img/on.ico">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <script>
             function folding(num) {