Fixed a bug in baseURL - the directory must be ended with a slash for urljoin().

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

diff --git a/reindex_blog.py b/reindex_blog.py
index f6505421239d531233636126b7f9ad1a91da68cb..b422784b960c85c9721b3eec07fa57f81d4d5057 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -10,8 +10,9 @@ __copyright__ = "Copyright (C) 2006 PhiloSoft Design"
 
 import sys, os
 
-blog_filename = sys.argv[1]
+blog_data_root = sys.argv[1]
 blog_root = sys.argv[2]
+blog_filename = os.path.join(blog_data_root, "blog_dict.pickle")
 
 try:
    import cPickle as pickle
@@ -44,8 +45,7 @@ for dirpath, dirs, files in os.walk(blog_root):
    if not d.startswith("20") and not d.isdigit():
       continue
    for file in files:
-      # Ignore index.tmpl and *.html files; supose all other files are *.tmpl
-      if file == "index.tmpl" or file.endswith(".html"):
+      if not file.endswith(".tmpl"):
          continue
       fullpath = os.path.join(dirpath, file)
       template = Template(file=fullpath)
@@ -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,)
 
@@ -180,11 +180,11 @@ def write_template(level, year, month, day, titles, tags=None):
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
-<H1>Журнал: %(day)d %(month_name_ru0)s %(year)s</H1>
+<H1>Журнал: %(day)d %(month_name_ru)s %(year)s</H1>
 """ % {
       "year": year, "cyear": year or 2005,
       "month_abbr_en": months_abbrs_en[imonth], "month_name_en": months_names_en[imonth],
-      "month_name_ru0": months_names_ru0[imonth],
+      "month_name_ru": months_names_ru[imonth],
       "day": iday
    })
 
@@ -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)
@@ -384,7 +389,10 @@ from atom_10 import atom_10
 from rss_20 import rss_20
 from news import NewsItem
 
-baseURL = "http://phd.pp.ru/Russian/blog/"
+if blog_root:
+   baseURL = "http://phd.pp.ru/%s/" % blog_root
+else:
+   baseURL = "http://phd.pp.ru/"
 
 items = []
 for item in tuple(reversed(all_titles_tags))[:10]: