X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tags.py;h=44f1a070d02b08c02e9b1f265ba9ec8095bd5fb5;hb=553446ee8da7062c60915a2078d1c7311e85d612;hp=e1d5dd11eaa625d321a49cff9bbe0249feaffefc;hpb=e52513e74175e0b193cfcb34020bcd4b44620001;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/tags.py b/tags.py
index e1d5dd1..44f1a07 100644
--- a/tags.py
+++ b/tags.py
@@ -45,6 +45,8 @@ def _test_post(post, tree):
             return value1 or value2
     elif op == 'NOT':
         return not _test_post(post, tree[1])
+    elif op == 'PARENS':
+        return _test_post(post, tree[1])
     else:
         raise ValueError("Cannot get there")
 
@@ -59,7 +61,8 @@ def find_tags(tree):
         for post in posts:
             if _test_post(post, tree):
                 _posts.append((
-                    '/'.join((year, month, day, post[0].replace('.tmpl', '.html'))),
+                    year, month, day,
+                    '/'.join((year, month, day, post[0][:-len("tmpl")] + "html")),
                     post[1]))
     _posts.sort(reverse=True)
     return _posts