X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/32e632734c0a8390775bb8661edc78c2045cf5f3..8ecd1d2fd23efe7ca31667890f0963fdcd92fa2e:/src/catalogue/api/tojson.py

diff --git a/src/catalogue/api/tojson.py b/src/catalogue/api/tojson.py
index 1fe055cad..3d47cd995 100644
--- a/src/catalogue/api/tojson.py
+++ b/src/catalogue/api/tojson.py
@@ -82,7 +82,7 @@ tags = {
 
     'begin': ('_ignore', True, {'class': 'reference'}, {'data-uri': 'href'}, False),
     'end': ('_ignore', True, {'class': 'reference'}, {'data-uri': 'href'}, False),
-    'motyw': ('a', True, {'class': 'theme'}, None, False),
+    'motyw': ('_ignore', True, {'class': 'theme'}, None, False),
 
     'pa': ('a', True, {'class': 'footnote footnote-pa'}, None, False),
     'pe': ('a', True, {'class': 'footnote footnote-pe'}, None, False),
@@ -97,7 +97,17 @@ id_prefixes = {
     'pr': 'fn',
     'pt': 'fn',
     'ptrad': 'fn',
-    }
+    'wers': 'f',
+    'wers_wciety': 'f',
+    'wers_cd': 'f',
+    'wers_akap': 'f',
+    'zastepnik_wersu': 'f',
+    'wers_do_prawej': 'f',
+    'wers_srodek': 'f',
+    'akap': 'f',
+    'akap_cd': 'f',
+    'akap_dialog': 'f',
+}
 
 
 #tree = etree.parse(argv[1])
@@ -111,7 +121,7 @@ front2 = set(['autor_utworu'])
 
 
 def norm(text):
-    text = text.replace('---', '—').replace('--', '–').replace('...', '…').replace(',,', '„').replace('"', '”')
+    text = text.replace('---', '—').replace('--', '–').replace('...', '…').replace(',,', '„').replace('"', '”').replace('\n', ' ')
     return text
 
 
@@ -133,9 +143,11 @@ def toj(elem, S):
             if 'dlugi_cytat' not in S['stack'] and 'poezja_cyt' not in S['stack']:
                 S['vindex'] += 1
                 output['visibleNumber'] = S['vindex']
-        id_prefix = id_prefixes.get(tag, 'i')
+        id_prefix = id_prefixes.get(elem.tag, 'i')
         S['id'][id_prefix] += 1
         output['id'] = id_prefix + str(S['id'][id_prefix])
+        if elem.attrib.get('id'):
+            output['id'] = 'wl-' + elem.attrib.get('id')
         if attrs:
             output['attr'] = attrs.copy()
         if attr_map: