Fix a bug: do not override title

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

diff --git a/search-tags.py b/search-tags.py
index 8d322d12057ed3290646c67c3c99b94846a6e877..fe006bfd5b69f41d1759baa56b8905ad1da58893 100755 (executable)
--- a/search-tags.py
+++ b/search-tags.py
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# coding: koi8-r
 """Search tags CGI"""
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
@@ -35,7 +36,26 @@ else:
             redirect("/Russian/blog/tags/%s.html" % tag, status="301 Moved")
             sys.exit()
         status = "404 Tag not found"
-        title = "Error!"
-        body = "Tag does not exist!"
+        title = "Ошибка!"
+        body = "Тег %s не существует!" % tag
+    else: # Process tree
+        from tags import find_tags
+        posts = find_tags(tree)
+        status = None
+        title = "Записи, найденные для выражения " + 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)