버그 수정 및 검색 속도 향상(?)

route/api_search.py

@@ -19,14 +19,15 @@ def api_search_2(conn, name):
     curs.execute(db_change('select data from other where name = "count_all_title"'))
     if int(curs.fetchall()[0][0]) < 30000:
         curs.execute(db_change("" + \
-            "select distinct title, case when title like ? then 'title' else 'data' " + \
-            "end from data where title like ? or data like ? order by case " + \
-            "when title like ? then 1 else 2 end limit ?, ?"),
+            "select distinct title, case " + \
+            "when title >= '' and title like ? then 'title' else 'data' end from data " + \
+            "where title >= '' and (title like ? or data like ?) order by case " + \
+            "when title >= '' and title like ? then 1 else 2 end limit ?, ?"),
             ['%' + name + '%', '%' + name + '%', '%' + name + '%', '%' + name + '%', page, num]
         )
     else:
-        curs.execute(db_change("select title from data where title like ? order by title limit ?, 50"),
-            ['%' + name + '%', sql_num]
+        curs.execute(db_change("select title from data where title >= '' and title like ? order by title limit ?, ?"),
+            ['%' + name + '%', page, num]
         )
     all_list = curs.fetchall()
     if all_list:

route/search_deep.py

@@ -37,9 +37,9 @@ def search_deep_2(conn, name):
     if int(curs.fetchall()[0][0]) < 30000:
         curs.execute(db_change("" + \
             "select distinct title, case " + \
-            "when title like ? then 'title' else 'data' end from data " + \
-            "where title like ? or data like ? order by case " + \
-            "when title like ? then 1 else 2 end limit ?, 50"),
+            "when title >= '' and title like ? then 'title' else 'data' end from data " + \
+            "where title >= '' and (title like ? or data like ?) order by case " + \
+            "when title >= '' and title like ? then 1 else 2 end limit ?, 50"),
             ['%' + name + '%', '%' + name + '%', '%' + name + '%', '%' + name + '%', sql_num]
         )
         all_list = curs.fetchall()
@@ -54,7 +54,7 @@ def search_deep_2(conn, name):
 
                 div_plus += '<li><a href="/w/' + url_pas(data[0]) + '">' + data[0] + '</a> (' + data[1] + ')</li>'
     else:
-        curs.execute(db_change("select title from data where title like ? order by title limit ?, 50"),
+        curs.execute(db_change("select title from data where title >= '' and title like ? order by title limit ?, 50"),
             ['%' + name + '%', sql_num]
         )
         all_list = curs.fetchall()

route/tool/set_mark/namumark.py

@@ -787,7 +787,7 @@ def namumark(conn, data, title, main_num, include_num):
                 video_src = 'https://embed.nicovideo.jp/watch/' + video_code
 
             data = macro_re.sub(
-                '<iframe style="width: ' + video_width + '; height: ' + video_height + ';" src="' + video_src + video_start + '" allowfullscreen></iframe>', 
+                '<iframe style="width: ' + video_width + '; height: ' + video_height + ';" src="' + video_src + video_start + '" frameborder="0" allowfullscreen></iframe>', 
                 data, 
                 1
             )

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.7-master-23",
+        "r_ver" : "v3.1.7-master-24",
         "c_ver" : "3171800",
         "s_ver" : "7"
     }, "stable" : {