Generating random hash for each created shelf.

[wolnelektury.git] / lib / librarian / bin / book2txt.py

diff --git a/lib/librarian/bin/book2txt.py b/lib/librarian/bin/book2txt.py
index 86f6f12..84a8f40 100755 (executable)
--- a/lib/librarian/bin/book2txt.py
+++ b/lib/librarian/bin/book2txt.py
@@ -11,10 +11,10 @@ REGEXES = [
     (r'<motyw[^>]*>(.|\n)*?</motyw>', ''),
     ('<(begin|end)\\sid=[\'|"][b|e]\\d+[\'|"]\\s/>', ''),
     (r'<extra>((<!--<(elementy_poczatkowe|tekst_glowny)>-->)|(<!--</(elementy_poczatkowe|tekst_glowny)>-->))</extra>', ''),
-    (r'<uwaga>[^<]*</uwaga>', ''),
-    (r'<p[a|e|r|t]>(.|\n)*?</p>', ''),
+    (r'<uwaga>(.|\n)*?</uwaga>', ''),
+    (r'<p[a|e|r|t]>(.|\n)*?</p[a|e|r|t]>', ''),
     (r'<[^>]+>', ''),
-    (r'/$', ''),
+    (r'/\n', '\n'),
     (r'---', u'—'),
     (r'--', u'-'),
     (r',,', u'„'),