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 a358a02f4de8a39254b3bce42d86f043d3d91c24..228866b8a8f5fa625dbc6d3bba5523351693a7c2 100755 (executable)
--- a/search-tags.py
+++ b/search-tags.py
@@ -13,7 +13,7 @@ import sys
 
 from lark import ParseError
 
-from html.response import redirect, response
+from html_output.response import redirect, response
 from parser import parser
 
 qs_dict = parse_qs(os.environ['QUERY_STRING'], encoding='koi8-r')
@@ -34,10 +34,12 @@ 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):
+            from tags import real_tag
+            rtag = real_tag(tag)
+            if rtag:
                 redirect(
-                    "/Russian/blog/tags/%s.html" % tag, status="301 Moved")
+                    "/Russian/blog/tags/%s.html" % rtag.replace(' ', '_'),
+                    status="301 Moved")
                 sys.exit()
             status = "404 Tag not found"
             title = "Ошибка!"