X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=4a77fbf78e045611cf3f946bb04202cddefe9ba8;hb=refs%2Fheads%2Fmaster;hp=68694488c816187d873c4427a21f8fb87785dfa8;hpb=b1faa0c3970917d72b16947dc18249ebafec695d;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 6869448..3370d6f 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -102,7 +102,7 @@ months_names_ru0 = [
 
 
 def encode_tag(tag):
-    return quote(tag.replace(' ', '_'))
+    return quote(tag.replace(' ', '_'), encoding='koi8-r')
 
 
 def write_template(level, year, month, day, titles, tags=None):
@@ -345,19 +345,22 @@ new_text = ["""\
 óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:</p>
 <ul class="small">
      <li>ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.</li>
-     <li>ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.</li>
-     <li>ïÐÅÒÁÔÏÒ '&amp;' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.</li>
-     <li>ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.</li>
+     <li>ïÐÅÒÁÔÏÒ '!' (NOT, not, îå, ÎÅ) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.</li>
+     <li>ïÐÅÒÁÔÏÒ '&amp;' (AND, and, é, É) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.</li>
+     <li>ïÐÅÒÁÔÏÒ '|' (OR, or, éìé, ÉÌÉ) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.</li>
      <li>ðÒÉÏÒÉÔÅÔ ÏÐÅÒÁÃÉÊ ÓÔÁÎÄÁÒÔÎÙÊ: NOT &gt; AND &gt; OR. óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.</li>
+     <li>ðÏÉÓË ÉÇÎÏÒÉÒÕÅÔ ÒÅÇÉÓÔÒ: ÔÅÇÉ Linux É linux ÜË×É×ÁÌÅÎÔÎÙ.</li>
 </ul>
 <p class="small">
 ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
-ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&amp;!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
-linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
+ÎÁ ÓÔÒÁÎÉÃÕ Linux.html; linux&amp;!debian - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
+Linux É ÎÅÔ ÔÅÇÁ Debian; Linux and not Debian - ÔÏ ÖÅ ÓÁÍÏÅ. åÓÌÉ × ÔÅÇÅ ÅÓÔØ
+ÐÒÏÂÅÌ ("í£ÒÔ×ÏÅ ÍÏÒÅ", "þ£ÒÎÏÅ ÍÏÒÅ") - ÅÇÏ ÎÁÄÏ ÚÁÍÅÎÉÔØ ÎÁ ÐÏÄÞ£ÒËÉ×ÁÎÉÅ;
+ÎÁÐÒÉÍÅÒ: "éÚÒÁÉÌØ é îå Í£ÒÔ×ÏÅ_ÍÏÒÅ", "ëÁ×ËÁÚ É ÎÅ Þ£ÒÎÏÅ_ÍÏÒÅ".
 </p>
 
 <center>
-<form method=GET action="../../../cgi-bin/blog-ru/search-tags/search-tags.py">
+<form method=GET action="../../../cgi-bin/blog-ru/search-tags.cgi">
      <input type=text name=q>
      <input type=submit name=submit value="éÓËÁÔØ">
 </form>