X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=c2a87c603062d38d493ed1bef8031b88413ff47a;hb=331965859222bca39a7fc251cdc93830620c8a4a;hp=4674ae0ea575628fb73864acf5fdc686fb6e4807;hpb=1bccabe63f4f3ddc450c1e37edd606b36671ae21;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 4674ae0..c2a87c6 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -2,9 +2,10 @@
 # -*- coding: koi8-r -*-
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2006-2013 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
 
 import sys, os
+from Cheetah.compat import string_type
 
 blog_data_root = sys.argv[1]
 blog_root = sys.argv[2]
@@ -54,7 +55,7 @@ for dirpath, dirs, files in os.walk(blog_root):
       lead = template.Lead.decode('utf-8').encode('koi8-r')
 
       tags = template.Tag
-      if isinstance(tags, basestring):
+      if isinstance(tags, string_type):
          tags = (tags,)
       tags = [tag.decode('utf-8').encode('koi8-r') for tag in tags]
 
@@ -352,18 +353,20 @@ new_text = ["""\
 #def body_html
 <h1>ôÅÇÉ</h1>
 
-<p class="head">
+<p class="head small">
 æÏÒÍÁ ÐÏÉÓËÁ ÐÏÚ×ÏÌÑÅÔ ÉÓËÁÔØ ÓÏÏÂÝÅÎÉÑ × ÂÌÏÇÅ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ×ÙÒÁÖÅÎÉÀ.
-óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:<ul>
+óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:</p>
+<ul class="small">
     <li>ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.</li>
-    <li>ïÐÅÒÁÔÏÒ '!' (NOT) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.</li>
-    <li>ïÐÅÒÁÔÏÒ '&amp;' (AND) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.</li>
-    <li>ïÐÅÒÁÔÏÒ '|' (OR) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÄÉÎ ÉÚ ÔÅÇÏ×.</li>
-    <li>óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.</li>
+    <li>ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.</li>
+    <li>ïÐÅÒÁÔÏÒ '&amp;' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.</li>
+    <li>ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.</li>
+    <li>ðÒÉÏÒÉÔÅÔ ÏÐÅÒÁÃÉÊ ÓÔÁÎÄÁÒÔÎÙÊ: NOT &gt; AND &gt; OR. óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.</li>
 </ul>
-ðÒÏÂÅÌÙ ÎÅ ÄÏÐÕÓËÁÀÔÓÑ. ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
+<p class="small">
+ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
 ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&amp;!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
-linux É ÎÅÔ ÔÅÇÁ audio.
+linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
 </p>
 
 <center>
@@ -373,7 +376,6 @@ linux 
 </form>
 </center>
 
-<p class="head">
 <dl>
 """]
 
@@ -426,7 +428,6 @@ for i, (count, tag, links) in enumerate(all_tags):
 #def body_html
 <h1>%s</h1>
 
-<p class="head">
 <ul>
 """ % tag)
 
@@ -443,7 +444,6 @@ for i, (count, tag, links) in enumerate(all_tags):
 
    tag_text.append("""\
 </ul>
-</p>
 #end def
 $phd_site.respond(self)
 """)
@@ -451,7 +451,6 @@ $phd_site.respond(self)
 
 new_text.append("""\
 </dl>
-</p>
 #end def
 $phd_site.respond(self)
 """)
@@ -565,7 +564,6 @@ for item in tuple(reversed(all_titles_tags))[:10]:
    item.categoryList = tags
    body = bodies[(year, month, day, file)]
    body = absolute_urls(body, baseURL + url_path)
-   body = body.decode('koi8-r').encode('utf-8')
    item.body = body
    item.excerpt = get_first_p(body)