X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=92a02272ea79c60a9f79b0ae21fe8733d6fa47f2;hb=eb2a1c0e122dc1f83bd3b220d2d00103f0dcda8c;hp=29d58d59c9925163dfe7be4e916a4b0796fde6c3;hpb=2f4077c7be4097e2e4c318cfdb818746cb223b66;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 29d58d5..92a0227 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -4,7 +4,7 @@
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phd.pp.ru>"
 __copyright__ = "Copyright (C) 2006 PhiloSoft Design"
 
 
@@ -84,7 +84,6 @@ if blog <> old_blog:
    pickle.dump(blog, blog_file, pickle.HIGHEST_PROTOCOL)
    blog_file.close()
 
-
 # Localized month names
 
 import locale
@@ -128,8 +127,8 @@ def write_template(level, year, month, day, titles, tags=None):
 
    if level == 0:
       new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog"
-#attr $Description = "BroytMann Russian Blog Index Document"
+#attr $Title = "Oleg Broytman's blog"
+#attr $Description = "Broytman 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")
@@ -141,8 +140,8 @@ def write_template(level, year, month, day, titles, tags=None):
 
    elif level == 1:
       new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog: %(year)s"
-#attr $Description = "BroytMann Russian Blog %(year)s Index Document"
+#attr $Title = "Oleg Broytman's blog: %(year)s"
+#attr $Description = "Broytman Russian Blog %(year)s Index Document"
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
@@ -152,8 +151,8 @@ def write_template(level, year, month, day, titles, tags=None):
    elif level == 2:
       imonth = int(month)
       new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog: %(month_abbr_en)s %(year)s"
-#attr $Description = "BroytMann Russian Blog %(month_name_en)s %(year)s Index Document"
+#attr $Title = "Oleg Broytman's blog: %(month_abbr_en)s %(year)s"
+#attr $Description = "Broytman Russian Blog %(month_name_en)s %(year)s Index Document"
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
@@ -179,8 +178,8 @@ def write_template(level, year, month, day, titles, tags=None):
 """ % titles[0][3])
 
       new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog: %(day)d %(month_abbr_en)s %(year)s"
-#attr $Description = "BroytMann Russian Blog %(day)d %(month_name_en)s %(year)s Index Document"
+#attr $Title = "Oleg Broytman's blog: %(day)d %(month_abbr_en)s %(year)s"
+#attr $Description = "Broytman Russian Blog %(day)d %(month_name_en)s %(year)s Index Document"
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
@@ -195,7 +194,7 @@ def write_template(level, year, month, day, titles, tags=None):
    save_titles = titles[:]
    titles.reverse()
 
-   save_day = None
+   save_date = None
    for year, month, day, file, title, lead in titles:
       href = []
       if level == 0:
@@ -207,12 +206,12 @@ def write_template(level, year, month, day, titles, tags=None):
       href.append(file)
       href = '/'.join(href)
       if day[0] == '0': day = day[1:]
-      if save_day <> day:
+      if save_date <> (year, month, day):
          if level == 0:
             new_text.append('\n<h2>%s %s %s</h2>' % (day, months_names_ru[int(month)], year))
          else:
             new_text.append('\n<h2>%s %s</h2>' % (day, months_names_ru[int(month)]))
-         save_day = day
+         save_date = year, month, day
       if lead:
          lead = lead + ' '
       else:
@@ -250,11 +249,14 @@ def write_template(level, year, month, day, titles, tags=None):
 </p>
 ''')
 
+      max_year = int(sorted(years.keys())[-1])
+      years = range(2005, max_year+1)
+
       new_text.append('''
 <p class="head">ðÏ ÇÏÄÁÍ:
 ''')
       first_year = True
-      for year in sorted(years.keys()):
+      for year in years:
          if first_year:
             first_year = False
          else:
@@ -326,8 +328,8 @@ new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
 #extends phd_pp_ru
 #implements respond
-#attr $Title = "Oleg BroytMann's blog: tags"
-#attr $Description = "BroytMann Russian Blog Tags Index Document"
+#attr $Title = "Oleg Broytman's blog: tags"
+#attr $Description = "Broytman Russian Blog Tags Index Document"
 #attr $Copyright = 2006
 ##
 #def body_html
@@ -346,8 +348,8 @@ for count, tag, links in all_tags:
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
 #extends phd_pp_ru
 #implements respond
-#attr $Title = "Oleg BroytMann's blog: tag %s"
-#attr $Description = "BroytMann Russian Blog Tag %s Index Document"
+#attr $Title = "Oleg Broytman's blog: tag %s"
+#attr $Description = "Broytman Russian Blog Tag %s Index Document"
 #attr $Copyright = 2006
 ##
 #def body_html
@@ -415,12 +417,12 @@ for item in tuple(reversed(all_titles_tags))[:10]:
    item.categoryList = tags
 
 namespace = {
-   "title": "Oleg Broytmann's blog",
+   "title": "Oleg Broytman's blog",
    "baseURL": baseURL,
    "indexFile": "",
    "description": "",
    "lang": "ru",
-   "author": "Oleg Broytmann",
+   "author": "Oleg Broytman",
    "email": "phd@phd.pp.ru",
    "generator": os.path.basename(sys.argv[0]),
    "posts": items,