X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=33e9077aefd0e6472959c3300d1f105ea59ef6b0;hb=f95205f4ff896df01ca7c9c3d672147408e0b119;hp=40b36c246ec1857c043f6707c53f3bc470f69e3c;hpb=be855e58c1e9d0a9a8a908558209c6c2ce9fe43c;p=phdru.name%2Fphdru.name.git
diff --git a/reindex_blog.py b/reindex_blog.py
index 40b36c2..33e9077 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -2,7 +2,7 @@
# -*- coding: koi8-r -*-
__author__ = "Oleg Broytman "
-__copyright__ = "Copyright (C) 2006-2013 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2014 PhiloSoft Design"
import sys, os
@@ -352,18 +352,20 @@ new_text = ["""\
#def body_html
ôÅÇÉ
-
+
æÏÒÍÁ ÐÏÉÓËÁ ÐÏÚ×ÏÌÑÅÔ ÉÓËÁÔØ ÓÏÏÂÝÅÎÉÑ × ÂÌÏÇÅ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ×ÙÒÁÖÅÎÉÀ.
-óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:
+
- ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '!' (NOT) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '&' (AND) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '|' (OR) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÄÉÎ ÉÚ ÔÅÇÏ×.
+ - ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '&' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.
- óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
-ðÒÏÂÅÌÙ ÎÅ ÄÏÐÕÓËÁÀÔÓÑ. ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
-ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ linux É
-ÎÅÔ ÔÅÇÁ audio.
+
+ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
+ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
+linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
@@ -373,7 +375,6 @@ new_text = ["""\
-
"""]
@@ -426,7 +427,6 @@ for i, (count, tag, links) in enumerate(all_tags):
#def body_html
%s
-
""" % tag)
@@ -443,7 +443,6 @@ for i, (count, tag, links) in enumerate(all_tags):
tag_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -451,7 +450,6 @@ $phd_site.respond(self)
new_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -565,7 +563,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)