Add a pointer to my LiveJournal.

[phdru.name/phdru.name.git] / reindex_blog.py

diff --git a/reindex_blog.py b/reindex_blog.py
index b75104df2c2a18f4be44d37672580e63d7590589..3a189657b581de59c5bbaf373acfb8a371bdde60 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -53,7 +53,7 @@ for dirpath, dirs, files in os.walk(blog_root):
       title = ' '.join(title_parts[6:])
       lead = getattr(template, "Lead", None)
 
-      tags = getattr(template, "Tag", None)
+      tags = template.Tag
       if isinstance(tags, basestring):
          tags = (tags,)
 
@@ -260,6 +260,11 @@ def write_template(level, year, month, day, titles, tags=None):
 </p>
 ''')
 
+      new_text.append("""
+<hr>
+<p class="head"><a href="http://phd.livejournal.com/">ЖЖ</a>
+""")
+
    new_text.append("""\
 #end def
 $phd_pp_ru.respond(self)
@@ -299,8 +304,17 @@ for year in sorted(years.keys()):
       write_template(2, year, month, day, month_titles)
    write_template(1, year, month, day, year_titles)
 
+def by_count_rev_tag_link(t1, t2):
+   """Sort all_tags by count in descending order,
+   and by tags and links in ascending order
+   """
+   r = cmp(t1[0], t2[0])
+   if r:
+      return -r
+   return cmp((t1[1], t1[2]), (t2[1], t2[2]))
+
 all_tags = [(len(links), tag, links) for (tag, links) in all_tags.items()]
-all_tags.sort()
+all_tags.sort(by_count_rev_tag_link)
 
 write_template(0, year, month, day, all_titles[-20:], all_tags)