X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=reindex_blog.py;h=3370d6f892b7896aab65257b6b22cd4efc6658ae;hb=refs%2Fheads%2Fmaster;hp=bc34887d4076fe419cde94e4f7f1de2700e11749;hpb=1afa1542b43c3400cdf58b66d4c7c1e7c60c2e9a;p=phdru.name%2Fphdru.name.git
diff --git a/reindex_blog.py b/reindex_blog.py
index bc34887..3370d6f 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -5,7 +5,7 @@ __author__ = "Oleg Broytman "
__copyright__ = "Copyright (C) 2006-2024 PhiloSoft Design"
from calendar import _localized_month
-import cgi
+from html import escape
import locale
import sys, os
from urllib.parse import quote, urljoin
@@ -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 = ["""\
óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:
- ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '&' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.
+ - ïÐÅÒÁÔÏÒ '!' (NOT, not, îå, ÎÅ) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '&' (AND, and, é, É) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '|' (OR, or, éìé, ÉÌÉ) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.
- ðÒÉÏÒÉÔÅÔ ÏÐÅÒÁÃÉÊ ÓÔÁÎÄÁÒÔÎÙÊ: NOT > AND > OR. óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
+ - ðÏÉÓË ÉÇÎÏÒÉÒÕÅÔ ÒÅÇÉÓÔÒ: ÔÅÇÉ Linux É linux ÜË×É×ÁÌÅÎÔÎÙ.
ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
-ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
-linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
+ÎÁ ÓÔÒÁÎÉÃÕ Linux.html; linux&!debian - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
+Linux É ÎÅÔ ÔÅÇÁ Debian; Linux and not Debian - ÔÏ ÖÅ ÓÁÍÏÅ. åÓÌÉ × ÔÅÇÅ ÅÓÔØ
+ÐÒÏÂÅÌ ("í£ÒÔ×ÏÅ ÍÏÒÅ", "þ£ÒÎÏÅ ÍÏÒÅ") - ÅÇÏ ÎÁÄÏ ÚÁÍÅÎÉÔØ ÎÁ ÐÏÄÞ£ÒËÉ×ÁÎÉÅ;
+ÎÁÐÒÉÍÅÒ: "éÚÒÁÉÌØ é îå Í£ÒÔ×ÏÅ_ÍÏÒÅ", "ëÁ×ËÁÚ É ÎÅ Þ£ÒÎÏÅ_ÍÏÒÅ".
-
@@ -485,7 +488,7 @@ class AbsURLHTMLParser(_HTMLParser):
def start_a(self, attrs):
self.accumulator += '