Upgrade JSONField.

[wolnelektury.git] / apps / oai / views.py

diff --git a/apps/oai/views.py b/apps/oai/views.py
index 4c44e56..5ef5bd4 100644 (file)
--- a/apps/oai/views.py
+++ b/apps/oai/views.py
@@ -1,12 +1,13 @@
 
 

-from oai.handlers import Catalogue
+from oai.handlers import Catalogue, NS_DCTERMS, nsdcterms

 from oaipmh.server import ServerBase, oai_dc_writer, NS_OAIDC, NS_DC, NS_XSI, nsoaidc, nsdc
 from oaipmh.metadata import MetadataRegistry
 from django.http import HttpResponse
 from lxml.etree import tostring, SubElement
 
 
 from oaipmh.server import ServerBase, oai_dc_writer, NS_OAIDC, NS_DC, NS_XSI, nsoaidc, nsdc
 from oaipmh.metadata import MetadataRegistry
 from django.http import HttpResponse
 from lxml.etree import tostring, SubElement
 
 

-ns_map = {'oai_dc': NS_OAIDC, 'dc': NS_DC, 'xsi': NS_XSI}
+
+#ns_map = {'oai_dc': NS_OAIDC, 'dc': NS_DC, 'xsi': NS_XSI }

 
 
 def fbc_oai_dc_writer(element, metadata):
 
 
 def fbc_oai_dc_writer(element, metadata):


@@ -21,14 +22,37 @@ def fbc_oai_dc_writer(element, metadata):
         'title', 'creator', 'subject', 'description', 'publisher',
         'contributor', 'date', 'type', 'format', 'identifier',
         'source', 'language', 'relation', 'coverage', 'rights',
         'title', 'creator', 'subject', 'description', 'publisher',
         'contributor', 'date', 'type', 'format', 'identifier',
         'source', 'language', 'relation', 'coverage', 'rights',

-        'isPartOf', 'hasPart']:
+        ]:

         for value in map.get(name, []):
             e = SubElement(e_dc, nsdc(name))
             e.text = value
                
 
         for value in map.get(name, []):
             e = SubElement(e_dc, nsdc(name))
             e.text = value
                
 

+def qdc_writer(element, metadata):
+    """FBC notified us that original writer does not output all necessary namespace declarations.
+    """
+    nsmap={'oai_dc': NS_OAIDC, 'dc': NS_DC, 'xsi': NS_XSI, 'dcterms': NS_DCTERMS}
+    map = metadata.getMap()
+    for name in [
+        'title', 'creator', 'subject', 'description', 'publisher',
+        'contributor', 'date', 'type', 'format', 'identifier',
+        'source', 'language', 'relation', 'coverage', 'rights',
+        ]:
+        for value in map.get(name, []):
+            e = SubElement(element, nsdc(name), nsmap=nsmap)
+            e.text = value
+
+    for name in ['hasPart', 'isPartOf']:
+        for value in map.get(name, []):
+            e = SubElement(element, nsdcterms(name), nsmap=nsmap)
+            e.text = value
+
+
+

 metadata_registry = MetadataRegistry()
 metadata_registry.registerWriter('oai_dc', fbc_oai_dc_writer)
 metadata_registry = MetadataRegistry()
 metadata_registry.registerWriter('oai_dc', fbc_oai_dc_writer)

+metadata_registry.registerWriter('qdc', qdc_writer)
+

 
 server = ServerBase(Catalogue(metadata_registry), metadata_registry,
     {'topxsi': NS_XSI})
 
 server = ServerBase(Catalogue(metadata_registry), metadata_registry,
     {'topxsi': NS_XSI})