X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=3a189657b581de59c5bbaf373acfb8a371bdde60;hb=91febbbbaed6330bf64dd711f4d4a101501b8126;hp=9d88601f79379bc3a16ac84d0e530f9c41cd9acf;hpb=3cf013401e16d5d6017f6a17bcd1365872dbf4e2;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 9d88601..3a18965 100755
--- 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,)
 
@@ -127,6 +127,9 @@ def write_template(level, year, month, day, titles, tags=None):
 #attr $Title = "Oleg BroytMann's blog"
 #attr $Description = "BroytMann Russian Blog Index Document"
 #attr $Copyright = %(cyear)s
+#attr $alternates = (("application/atom+xml", "News [Atom 1.0]", "atom_10.xml"),
+                     ("application/rss+xml",  "News [RSS 2.0]",  "rss_20.xml")
+)
 ##
 #def body_html
 <H1>öÕÒÎÁÌ</H1>
@@ -217,13 +220,20 @@ def write_template(level, year, month, day, titles, tags=None):
 ''' % (lead, href, title))
 
    if level == 0:
+      new_text.append("""
+<hr>
+
+<p class="head">îÏ×ÏÓÔÅ×ÁÑ ÌÅÎÔÁ × ÆÏÒÍÁÔÁÈ
+<A HREF="atom_10.xml">Atom 1.0 <img src="../../Graphics/atom_10.jpg" border=0></A>
+É <A HREF="rss_20.xml">RSS 2.0 <img src="../../Graphics/rss_20.jpg" border=0></A>.
+</p>
+""")
+
       years = {}
       for year, month, day, file, title, lead in save_titles:
          years[year] = True
       new_text.append('''
-<hr>
-
-<p class="noindent"><a href="tags/">ôÅÇÉ</a>:
+<p class="head"><a href="tags/">ôÅÇÉ</a>:
 ''')
       first_tag = True
       for count, tag, links in all_tags:
@@ -237,7 +247,7 @@ def write_template(level, year, month, day, titles, tags=None):
 ''')
 
       new_text.append('''
-<p class="noindent">ðÏ ÇÏÄÁÍ:
+<p class="head">ðÏ ÇÏÄÁÍ:
 ''')
       first_year = True
       for year in sorted(years.keys()):
@@ -250,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)
@@ -289,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)
 
@@ -391,6 +415,7 @@ namespace = {
    "lang": "ru",
    "author": "Oleg Broytmann",
    "email": "phd@phd.pp.ru",
+   "generator": os.path.basename(sys.argv[0]),
    "posts": items,
 }