fix

[wolnelektury.git] / src / catalogue / api / tojson.py

diff --git a/src/catalogue/api/tojson.py b/src/catalogue/api/tojson.py
index 1fe055c..fa6bafd 100644 (file)
--- a/src/catalogue/api/tojson.py
+++ b/src/catalogue/api/tojson.py
@@ -97,7 +97,17 @@ id_prefixes = {
     'pr': 'fn',
     'pt': 'fn',
     'ptrad': 'fn',
     '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])
 
 
 #tree = etree.parse(argv[1])


@@ -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']
             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])
         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:
         if attrs:
             output['attr'] = attrs.copy()
         if attr_map: