X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git;a=blobdiff_plain;f=tags.py;h=44f1a070d02b08c02e9b1f265ba9ec8095bd5fb5;hp=7bfc95ea28f04ed79e55bc7ead4af1d766a2e8b4;hb=refs%2Fheads%2Fgrako;hpb=fcd43ca74512fcecf3447d210df76f325ef5b78a diff --git a/tags.py b/tags.py index 7bfc95e..44f1a07 100644 --- a/tags.py +++ b/tags.py @@ -6,7 +6,7 @@ except ImportError: import pickle try: - blog_file = open(blog_filename, "rb") + blog_file = open('../../../../phdru.name/ru/' + blog_filename, "rb") except IOError: blog_dict = {} else: @@ -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() + _posts.sort(reverse=True) return _posts