Write lead and title in tags indices.

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

diff --git a/reindex_blog.py b/reindex_blog.py
index f554bc32a85323a737036999eb563007ef9f688f..4451baa740e25f20b60be92b3699fc69e4ca2413 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -279,7 +279,7 @@ for year in sorted(years.keys()):
                      tag_links = all_tags[tag]
                   else:
                      tag_links = all_tags[tag] = []
-                  tag_links.append('/'.join(("..", year, month, day, file)))
+                  tag_links.append(value)
          write_template(3, year, month, day, day_titles)
       write_template(2, year, month, day, month_titles)
    write_template(1, year, month, day, year_titles)
@@ -298,11 +298,14 @@ new_text = ["""\
 ##
 #def body_html
 <H1>Теги</H1>
+
+<p class="head">
+<dl>
 """]
 
 for count, tag, links in all_tags:
-   new_text.append("""
-<p class="head"><a href="%s.html">%s (%d)</a></p>
+   new_text.append("""\
+   <dt><a href="%s.html">%s (%d)</a></dt>
 """ % (tag, tag, count))
 
    tag_text = ["""\
@@ -315,21 +318,37 @@ for count, tag, links in all_tags:
 ##
 #def body_html
 <H1>%s</H1>
+
+<p class="head">
+<ul>
 """ % (tag, tag, tag)]
 
-   for link in links:
-      junk, year, month, day, filename = link.split('/')
-      tag_text.append("""
-<p class="head"><a href="%s">%s/%s/%s: %s</a></p>
-""" % (link, year, month, day, filename))
+   count = 0
+   for year, month, day, filename, title, lead in reversed(links):
+      if lead:
+         lead = lead + ' '
+      else:
+         lead = ''
+      link = "../%s/%s/%s/%s" % (year, month, day, filename)
+      item_text = """<li><a href="%s">%s/%s/%s: %s%s</a></li>""" % (link, year, month, day, lead, title)
+
+      count += 1
+      if count <= 5:
+         new_text.append("      <dd>%s</dd>\n" % item_text)
+
+      tag_text.append("   %s\n" % item_text)
 
    tag_text.append("""\
+</ul>
+</p>
 #end def
 $phd_pp_ru.respond(self)
 """)
    write_if_changed(os.path.join("tags", tag+".tmpl"), ''.join(tag_text))
 
 new_text.append("""\
+</dl>
+</p>
 #end def
 $phd_pp_ru.respond(self)
 """)