Jelajahi Sumber

API 만든 김에 검색도 API로 전환

잉여개발기 (SPDV) 2 tahun lalu
induk
melakukan
707e10ed07
2 mengubah file dengan 9 tambahan dan 13 penghapusan
  1. 4 4
      app.py
  2. 5 9
      route/main_search_deep.py

+ 4 - 4
app.py

@@ -723,10 +723,10 @@ app.route('/manager/<int:num>/<everything:add_2>', methods = ['POST', 'GET'])(ma
 # app.route('/guide/<doc_name>')(main_tool_guide)
 
 app.route('/search', methods=['POST'])(main_search)
-app.route('/search/<everything:name>', methods = ['POST', 'GET'])(main_search_deep)
-app.route('/search_page/<int:num>/<everything:name>', methods = ['POST', 'GET'])(main_search_deep)
-app.route('/search_data/<everything:name>', defaults = { 'search_type' : 'data' }, methods = ['POST', 'GET'])(main_search_deep)
-app.route('/search_data_page/<int:num>/<everything:name>', defaults = { 'search_type' : 'data' }, methods = ['POST', 'GET'])(main_search_deep)
+app.route('/search/<everything:name>', defaults = { 'db_set' : db_set_str }, methods = ['POST', 'GET'])(main_search_deep)
+app.route('/search_page/<int:num>/<everything:name>', defaults = { 'db_set' : db_set_str }, methods = ['POST', 'GET'])(main_search_deep)
+app.route('/search_data/<everything:name>', defaults = { 'search_type' : 'data', 'db_set' : db_set_str }, methods = ['POST', 'GET'])(main_search_deep)
+app.route('/search_data_page/<int:num>/<everything:name>', defaults = { 'search_type' : 'data', 'db_set' : db_set_str }, methods = ['POST', 'GET'])(main_search_deep)
 app.route('/goto', methods=['POST'])(main_search_goto)
 app.route('/goto/<everything:name>', methods=['GET', 'POST'])(main_search_goto)
 

+ 5 - 9
route/main_search_deep.py

@@ -1,6 +1,8 @@
 from .tool.func import *
 
-def main_search_deep(name = 'Test', search_type = 'title', num = 1):
+from .go_api_search import api_search
+
+def main_search_deep(db_set, name = 'Test', search_type = 'title', num = 1):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
@@ -48,18 +50,12 @@ def main_search_deep(name = 'Test', search_type = 'title', num = 1):
                         <a ''' + link_id + ' href="/w/' + url_pas(name) + '">' + html.escape(name) + '''</a>
                     </li>
                 </ul>
-                <hr class="main_hr">
                 <ul class="opennamu_ul">
             '''
 
-            if search_type == 'title':
-                curs.execute(db_change("select title from data where title like ? collate nocase order by title limit ?, 50"), ['%' + name + '%', sql_num])
-            else:
-                curs.execute(db_change("select title from data where data like ? collate nocase order by title limit ?, 50"), ['%' + name + '%', sql_num])
-
-            all_list = curs.fetchall()
+            all_list = json.loads(api_search(db_set, name, search_type, num).data)
             for data in all_list:
-                div += '<li><a href="/w/' + url_pas(data[0]) + '">' + data[0] + '</a></li>'
+                div += '<li><a href="/w/' + url_pas(data) + '">' + data + '</a></li>'
 
             div += '</ul>'