fix in librarian

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

diff --git a/apps/oai/views.py b/apps/oai/views.py
index af4bd1c..5bb9025 100644 (file)
--- a/apps/oai/views.py
+++ b/apps/oai/views.py
@@ -1,9 +1,13 @@
-
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from oai.handlers import Catalogue, NS_DCTERMS, nsdcterms
 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.server import ServerBase, NS_OAIDC, NS_DC, NS_XSI, nsoaidc, nsdc

 from oaipmh.metadata import MetadataRegistry
 from django.http import HttpResponse
 from oaipmh.metadata import MetadataRegistry
 from django.http import HttpResponse

-from lxml.etree import tostring, SubElement
+from django.utils.functional import SimpleLazyObject
+from lxml.etree import SubElement

 
 
 
 
 
 


@@ -26,12 +30,12 @@ def fbc_oai_dc_writer(element, metadata):
         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.
     """
 
 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}
+    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',
     map = metadata.getMap()
     for name in [
         'title', 'creator', 'subject', 'description', 'publisher',


@@ -44,7 +48,6 @@ def qdc_writer(element, metadata):
 
     for name in ['hasPart', 'isPartOf']:
         for value in map.get(name, []):
 
     for name in ['hasPart', 'isPartOf']:
         for value in map.get(name, []):

-            print "%s %s" % (name, value)

             e = SubElement(element, nsdcterms(name), nsmap=nsmap)
             e.text = value
 
             e = SubElement(element, nsdcterms(name), nsmap=nsmap)
             e.text = value
 


@@ -55,8 +58,10 @@ metadata_registry.registerWriter('oai_dc', fbc_oai_dc_writer)
 metadata_registry.registerWriter('qdc', qdc_writer)
 
 
 metadata_registry.registerWriter('qdc', qdc_writer)
 
 

-server = ServerBase(Catalogue(metadata_registry), metadata_registry,
-    {'topxsi': NS_XSI})
+server = SimpleLazyObject(lambda: 
+    ServerBase(Catalogue(metadata_registry), metadata_registry,
+        {'topxsi': NS_XSI})
+    )

 
 
 def oaipmh(request):
 
 
 def oaipmh(request):