X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git;a=blobdiff_plain;f=search-tags.py;h=c2884fab2942aeeeb7374451770cbd556d5c0581;hp=27f14f0865f895f893349651784ff059b9114ba7;hb=HEAD;hpb=9379ed3a21cf6aaacc9c3d3a2f6349aa22b7d3ee

diff --git a/search-tags.py b/search-tags.py
index 27f14f0..c2884fa 100755
--- a/search-tags.py
+++ b/search-tags.py
@@ -3,14 +3,13 @@
 """Search tags CGI"""
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2014-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import cgi, sys
-from ply.lex import LexError
-
+from lark import ParseError
 from html.response import redirect, response
-from parser.parser import parser
+from parser import parser
 
 form = cgi.FieldStorage()
 if not form.has_key('q'):
@@ -22,33 +21,39 @@ else:
     q = form['q'].value
     try:
         tree = parser.parse(q)
-    except LexError:
-        tree = None
-    if tree is None:
+    except ParseError:
         status = "400 Bad request"
         title = "Error!"
         body = "Bad query syntax!"
-    elif tree[0] == 'NAME': # Single tag - just do redirect
-        tag = tree[1]
-        assert isinstance(tag, str)
-        from tags import tag_exists
-        if tag_exists(tag):
-            redirect("/Russian/blog/tags/%s.html" % tag, status="301 Moved")
-            sys.exit()
-        status = "404 Tag not found"
-        title = "ïÛÉÂËÁ!"
-        body = "ôÅÇ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!" % tag
-    else: # Process tree
-        from tags import calc_tree
-        posts = calc_tree(tree)
-        status = None
-        title = "úÁÐÉÓÉ, ÎÁÊÄÅÎÎÙÅ ÄÌÑ ×ÙÒÁÖÅÎÉÑ " + q
-        if posts:
-            _posts = []
-            for suburl, title in posts:
-                _posts.append('<a href="/Russian/blog/%s">%s</a>' % (suburl, title))
-            body = "<br>\n".join(_posts)
-        else:
-            body = "îÅ ÎÁÊÄÅÎÏ ÎÉ ÏÄÎÏÊ ÚÁÐÉÓÉ."
+    else:
+        if tree[0] == 'NAME': # Single tag - just do redirect
+            tag = tree[1]
+            assert isinstance(tag, str)
+            from tags import tag_exists
+            if tag_exists(tag):
+                redirect("/Russian/blog/tags/%s.html" % tag, status="301 Moved")
+                sys.exit()
+            status = "404 Tag not found"
+            title = "ïÛÉÂËÁ!"
+            body = "ôÅÇ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!" % tag
+        else: # Process tree
+            from tags import find_tags
+            posts = find_tags(tree)
+            status = None
+            title = "úÁÐÉÓÉ, ÎÁÊÄÅÎÎÙÅ ÄÌÑ ×ÙÒÁÖÅÎÉÑ " + cgi.escape(q)
+            if posts:
+                _posts = ["""\
+    <p class="head">
+    <ul>
+    """]
+                for year, month, day, suburl, _title in posts:
+                    _posts.append('<li>%s-%s-%s <a href="../../../../Russian/blog/%s">%s</a></li>\n' % (year, month, day, suburl, _title))
+                _posts .append("""\
+    </ul>
+    </p>
+    """)
+                body = ''.join(_posts)
+            else:
+                body = "îÅ ÎÁÊÄÅÎÏ ÎÉ ÏÄÎÏÊ ÚÁÐÉÓÉ."
 
 response(title, body, status)