X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=search-tags.py;fp=search-tags.py;h=c0919660befab6331cff2de6532e3b0b5c01b642;hb=9268fcefc2fcf568893ccdd00ccb4c40a85f64ca;hp=33d141f33107c9f7fcdcc1728f4f160ba74d106d;hpb=fcd51c190450165c3315ed7e4f77bc1415db3d48;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/search-tags.py b/search-tags.py
index 33d141f..c091966 100755
--- a/search-tags.py
+++ b/search-tags.py
@@ -3,13 +3,13 @@
 """Search tags CGI"""
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014-2016 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2014-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import cgi, sys
-from grako.exceptions import FailedParse
-
+from parsimonious import ParseError
 from html.response import redirect, response
+from parser import parser
 
 form = cgi.FieldStorage()
 if not form.has_key('q'):
@@ -20,11 +20,8 @@ if not form.has_key('q'):
 else:
     q = form['q'].value
     try:
-        from parser.parser import TagsParser
-        from parser.build_ast import TagsSemantics
-        parser = TagsParser(parseinfo=False)
-        tree = parser.parse(q, semantics=TagsSemantics())
-    except FailedParse:
+        tree = parser.compile(q)
+    except ParseError:
         status = "400 Bad request"
         title = "Error!"
         body = "Bad query syntax!"