From 5e41730a7197c31e780b5a2241a4974c50b66960 Mon Sep 17 00:00:00 2001
From: yamat0jp <yamat0jp@yahoo.co.jp>
Date: Tue, 22 Nov 2016 21:25:04 +0900
Subject: [PATCH] search better

---
 __pycache__/index.cpython-35.pyc | Bin 15213 -> 15461 bytes
 index.py                         |  50 +++++++++++++++++++++++----------------
 static/db/db.json                |   2 +-
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/__pycache__/index.cpython-35.pyc b/__pycache__/index.cpython-35.pyc
index b61db88b46cb21d70d014c8f628106f85ae5c4b7..ed4ad64fe689e05dd18856910d4bf46f7d2843d8 100644
GIT binary patch
delta 1173
zcmZuxJ5Ll*6#mY<_6aO3kE~J%z5-ERl4TbVBcg>8d_Y7&qL3MZ<+*nkvy$1Y0V~_l
zju;XuEldoZHd@&kOG061VPWA9An}|5BP1q!zdiGP=Y03vb0_ob$&W&~wyZ3CE!BDN
zYVv*f<M~n)fW_+yuiTIZxIl(~gp3B4uudp)z>JQJfpws$BX7dhMY0KV8q_7&8m2i@
zN8#)tRmU8lW+XXd337gd%P8BAQSl6vU>m;0SLB1@?z2c_LWk1-r<lG`|NkUwUn&|{
zynfX6paX9CZ(WIdKtgynWd5k3@a!f$yY07j(C=w&nnz(GABG)3KEl0I(L!Mdt_JCz
zXGIv8_<~|Urc(@}umqRmAfGM@JLK!7i7^yIDBM0W;(>`46vJ>s$dthi`;)H1oB_2)
zZV+}Db*$Cd5!A8ot?U|&3LQN{XXlx<kSUj4<r*W9#|oJ^XV3EOm7(ND<l@$eC?E6n
zO1TBQ95yG$@EoG?IkSWNZdD?aYhw8DIb{%BZu*6l{|bj~V7Mthq=;WHHO%l+muOVr
zBt!L2e&sM0$mN&R<g}yi^V5j;to2lNuy;!J^|mhet?IqYePf0*Yv;UgCvH-!SKhW-
z>SV_pCqpeVG{x09i5mpk1!e@61iBb@t;ywOXVF%#gz;N=DUochOo4HMtiVHoI|3<z
zw7?67rl=~Hcu1g2HrWk0^Ui{^nBO(CD~@`qE;Bi%FE|V8jL4R9ax3$B^;jzWhAw*9
zws^m6T`T=3IRMpA1yxaq|0TMsU1zj-)iNGqtYOvEYMH60MhcUmRcz0;H<R^Rd>@FV
z*}`F$_rBvs<pxJdF_*JNNo{zaV+n7sxo3OwLX{p9Sw#do1U9|(WXgQUVbAubWE;^9
z?|0W*8u2z#J@n4oNj27Nve+$#@|lQIG!_kUSw*^+w!FdgczlcLanTK5w@7VyAJY9a
i<?W@9(;F|*{XOFEy2(0gTF;|MYrRq55H~^;(*6KVH`{ms

delta 890
zcmZ8eOHUJF6g_u3eN9_vAq6qzrBti|Ezrm_BqA$}O$eCs2ni%pfg+ZEt){`5u)u{T
z?mi4LB&^(E+$b9oSN;LxnizL3T=)l!3-2u&jG38}d+)jDeD}`xt@`7!)f9<X(;b<)
zV&<Lop?Aju;OFl)f92-{I6#44LcxGT*d@3IDjwK`iius2>p}G<Nt+i1A6GEBlqA<g
zH9?Mnf*+LtY(tbBJFKa>OfLO`>#f-bh2AirI%&uD!1bY;gX4v5qNQNL_KIY3X#y_m
z{V0U~xY#jlm{2Ehe6am!X0F)|pqULy&uYcs|HYi+K_Oh5$P!mM#X<`o&WR1|$QbuX
zx*|ey)eS(>IvJ7=TIW6<Ab?d_gQzr*^DV<7_;*V;h)O*i-Y^22E$Z<UBAa1Zu9QJe
zSay%ff8(BUJ9^&4V&P)K5qr#}8nO%ia;2zNR`V*yH>73+<{4(yWkx-l?z&)(-Pju6
z_Ka<ft0dPJ%>24tR$1sz9n;jUzofUbSNUSg%t1Y5NHwS)i8}@Q1PlSMz?wi&U{Aml
zcqy<bP!j0XZ~IzPma3B^D<B>Vp3VH`nfwZ;r#_W0KYCD6_w`h~Rk!yCySumyic>u`
zQIgR|7deX?XIZ<^M)Fw4EB)7qUg;MD3F_5H19xKktm}~tWXv$Bef=@oa@>}=>xl}b
zLIV8)2l~n2koSngzT=a@G|?^nedrBM>Am4mI?|tqFU1d-OpBS1gD{1o;ULTWBV%-^
zCr1_=54k)oysRGPA=RONKQhre_jdr0T4pMhJoOjL*SA(GYwER*jeZT)W)XW<{2W~l
OB@<?%v(XGv(D)7Fd#UaK

diff --git a/index.py b/index.py
index 867e878..db18789 100755
--- a/index.py
+++ b/index.py
@@ -276,27 +276,37 @@ class SearchHandler(tornado.web.RequestHandler):
         self.render('modules/search.htm',records=[],word1=word,db=dbname)
         
     def search(self,name):
-        table = self.application.db.table(name)
-        mem = TinyDB(storage=MemoryStorage)
-        for word in self.word.split():
-            for x in table.search(where('comment').search(word)):
-                if self.radiobox == 'comment':
-                    result = ''
-                    for text in x['raw'].splitlines(True):                  
+        table = self.application.db.table(name)    
+        element = self.word.split()
+        if len(element) == 0:
+            element = ['']
+        while len(element) < 3:
+            element.append(element[0])
+        if self.radiobox == 'comment':
+            query = (Query()[self.radiobox].search(element[0])) | (Query()[self.radiobox].search(element[1])) | (Query()[self.radiobox].search(element[2]))
+        else:
+            query = (Query()[self.radiobox] == element[0]) | (Query()[self.radiobox] == element[1]) | (Query()[self.radiobox] == element[2])
+        if self.radiobox == 'comment':
+            rec = []
+            mem = TinyDB(storage=MemoryStorage)            
+            for x in table.search(query):
+                result = ''
+                for text in x['raw'].splitlines(True):                  
+                    for word in self.word.split():                        
                         if text.find(word) > -1:
-                            result = result+'<p style=background-color:yellow>'+text+'</p>'                            
-                        else:
-                            result = result+'<p>'+text+'</p>'
-                    if mem.get(where('number') == x['number']) == None:
-                        i = mem.insert(x)
-                        mem.update({'comment':result},eids=[i])   
-                else:
-                    rec = table.search(where('name').search(word))
-                    return sorted(rec,key=lambda x: x['number'])     
-        rec = sorted(mem.all(),key=lambda x: x['number'])
-        mem.close()
-        return rec
-                                            
+                            result = result+'<p style=background-color:yellow>'+text+'<br></p>'  
+                            break                          
+                    else:
+                        result = result+'<p>'+text+'<br></p>'
+                i = mem.insert(x)
+                mem.update({'comment':result},eids=[i])   
+                rec = sorted(mem.all(),key=lambda x: x['number'])
+            mem.close()
+            return rec        
+        else:
+            rec = table.search(query)
+            return sorted(rec,key=lambda x: x['number'])   
+                                        
 class FooterModule(tornado.web.UIModule):
     def render(self,number,url,link):
         return self.render_string('modules/footer.htm',index=number,url=url,link=link)
diff --git a/static/db/db.json b/static/db/db.json
index 6f199c2..667e8af 100644
--- a/static/db/db.json
+++ b/static/db/db.json
@@ -1 +1 @@
-{"bbs3": {}, "bbs1": {}, "_default": {"1": {"kinds": "conf", "title": "pybbs", "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "mentenance": false, "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "count": 30, "bad_words": ["<style", "<link", "<script", "<img"], "password": "admin"}}, "bbs": {"1": {"title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b", "comment": "<p>\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n<br></p><p>\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n<br></p><p>\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n<br></p><p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002<br></p>", "raw": "\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "date": "2016/11/22 19:43", "name": "\u7ba1\u7406\u8005", "number": 1, "password": "admin"}}, "bbs2": {}}
\ No newline at end of file
+{"bbs1": {"1": {"date": "2016/11/22 20:45", "number": 1, "raw": "test\r\n\r\ntext", "password": "admin", "title": "bbs1", "comment": "<p>test\r\n<br></p><p>\r\n<br></p><p>text<br></p>", "name": "\u7ba1\u7406\u8005"}, "2": {"date": "2016/11/22 20:46", "number": 2, "raw": "first", "password": "admin", "title": "bbs1", "comment": "<p>first<br></p>", "name": "me"}, "3": {"date": "2016/11/22 21:22", "number": 3, "raw": "tt", "password": "admin", "title": "bbs1", "comment": "<p>tt<br></p>", "name": "me"}}, "bbs": {"1": {"date": "2016/11/22 19:43", "number": 1, "raw": "\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "password": "admin", "title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b", "comment": "<p>\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n<br></p><p>\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n<br></p><p>\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n<br></p><p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002<br></p>", "name": "\u7ba1\u7406\u8005"}}, "bbs3": {}, "bbs2": {}, "_default": {"1": {"bad_words": ["<style", "<link", "<script", "<img"], "count": 30, "mentenance": false, "password": "admin", "title": "pybbs", "kinds": "conf", "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"]}}}
\ No newline at end of file
-- 
2.11.0