Version 0.8: Python 3

[phdru.name/cgi-bin/blog-ru/search-tags.git] / search-tags.py

diff --git a/search-tags.py b/search-tags.py
index c0919660befab6331cff2de6532e3b0b5c01b642..228866b8a8f5fa625dbc6d3bba5523351693a7c2 100755 (executable)
--- a/search-tags.py
+++ b/search-tags.py
@@ -1,53 +1,64 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # coding: koi8-r
 """Search tags CGI"""
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2014-2024 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-import cgi, sys
-from parsimonious import ParseError
-from html.response import redirect, response
+from html import escape
+from urllib.parse import parse_qs
+import os
+import sys
+
+from lark import ParseError
+
+from html_output.response import redirect, response
 from parser import parser
 
-form = cgi.FieldStorage()
-if not form.has_key('q'):
+qs_dict = parse_qs(os.environ['QUERY_STRING'], encoding='koi8-r')
+if 'q' not in qs_dict or len(qs_dict['q']) > 1:
     status = "400 Bad request"
     title = "Error!"
     body = "Required parameter is missing!"
 
 else:
-    q = form['q'].value
+    q = qs_dict['q'][0]
     try:
-        tree = parser.compile(q)
+        tree = parser.parse(q)
     except ParseError:
         status = "400 Bad request"
         title = "Error!"
         body = "Bad query syntax!"
     else:
-        if tree[0] == 'NAME': # Single tag - just do redirect
+        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")
+            from tags import real_tag
+            rtag = real_tag(tag)
+            if rtag:
+                redirect(
+                    "/Russian/blog/tags/%s.html" % rtag.replace(' ', '_'),
+                    status="301 Moved")
                 sys.exit()
             status = "404 Tag not found"
             title = "Ошибка!"
             body = "Тег %s не существует!" % tag
-        else: # Process tree
+        else:  # Process tree
             from tags import find_tags
             posts = find_tags(tree)
             status = None
-            title = "Записи, найденные для выражения " + cgi.escape(q)
+            title = "Записи, найденные для выражения " + 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(
+                        '<li>%s-%s-%s '
+                        '<a href="../../../../Russian/blog/%s">%s</a></li>\n'
+                        % (year, month, day, suburl, _title))
                 _posts .append("""\
     </ul>
     </p>