X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=reindex_blog.py;h=ec6adc05a227b99c1e4bda9fc1a048686dfeff64;hb=10a6302c317764909c062a2528c37fca3f9f3dbd;hp=beba7c12823ae151a8f5de6619c9776758b9d713;hpb=6922322a54539e39cbba59653868fa9d749fa274;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index beba7c1..ec6adc0 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -1,12 +1,8 @@
 #! /usr/bin/env python
 # -*- coding: koi8-r -*-
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
-
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2006-2012 PhiloSoft Design"
 
 import sys, os
 
@@ -128,7 +124,8 @@ def write_template(level, year, month, day, titles, tags=None):
 
    new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#encoding koi8-r
+#extends phd_site
 #implements respond
 """]
 
@@ -180,7 +177,7 @@ def write_template(level, year, month, day, titles, tags=None):
 
       if len(titles) == 1:
          new_text.append("""\
-#attr $refresh = "0; URL=%s"
+#attr $Refresh = "0; URL=%s"
 """ % titles[0][3])
 
       new_text.append("""\
@@ -258,7 +255,7 @@ def write_template(level, year, month, day, titles, tags=None):
 ''')
 
       max_year = int(sorted(years.keys())[-1])
-      years = range(2005, max_year+1)
+      years = range(max_year, 2005, -1)
 
       new_text.append('''
 <p class="head">ðÏ ÇÏÄÁÍ:
@@ -281,7 +278,7 @@ def write_template(level, year, month, day, titles, tags=None):
 
    new_text.append("""\
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 
    write_if_changed(index_name, ''.join(new_text))
@@ -334,7 +331,8 @@ write_template(0, year, month, day, all_titles[-20:], all_tags)
 
 new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#encoding koi8-r
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tags"
 #attr $Description = "Broytman Russian Blog Tags Index Document"
@@ -365,7 +363,8 @@ for i, (count, tag, links) in enumerate(all_tags):
 
    tag_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#encoding koi8-r
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tag %s"
 #attr $Description = "Broytman Russian Blog Tag %s Index Document"
@@ -414,7 +413,7 @@ for i, (count, tag, links) in enumerate(all_tags):
 </ul>
 </p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
    write_if_changed(os.path.join(blog_root, "tags", tag+".tmpl"), ''.join(tag_text))
 
@@ -422,7 +421,7 @@ new_text.append("""\
 </dl>
 </p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 write_if_changed(os.path.join(blog_root, "tags", "index.tmpl"), ''.join(new_text))
 
@@ -481,6 +480,19 @@ class AbsURLHTMLParser(_HTMLParser):
    def end_a(self):
       self.accumulator += '</a>'
 
+   def start_img(self, attrs):
+      self.accumulator += '<img'
+      for attrname, value in attrs:
+         value = cgi.escape(value, True)
+         if attrname == 'src':
+            self.accumulator += ' src="%s"' % urljoin(self.base, value)
+         else:
+            self.accumulator += ' %s="%s"' % (attrname, value)
+      self.accumulator += '>'
+
+   def end_img(self):
+       pass
+
 def absolute_urls(body, base):
    parser = AbsURLHTMLParser(base)
 
@@ -502,9 +514,9 @@ from rss_20 import rss_20
 from news import NewsItem
 
 if blog_root:
-   baseURL = "http://phd.pp.ru/%s/" % blog_root
+   baseURL = "http://phdru.name/%s/" % blog_root
 else:
-   baseURL = "http://phd.pp.ru/"
+   baseURL = "http://phdru.name/"
 
 items = []
 for item in tuple(reversed(all_titles_tags))[:10]:
@@ -529,7 +541,7 @@ namespace = {
    "description": "",
    "lang": "ru",
    "author": "Oleg Broytman",
-   "email": "phd@phd.pp.ru",
+   "email": "phd@phdru.name",
    "generator": os.path.basename(sys.argv[0]),
    "posts": items,
 }