fix in librarian

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

diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index 142b81f..d9699f9 100644 (file)
--- a/apps/oai/handlers.py
+++ b/apps/oai/handlers.py
@@ -6,14 +6,10 @@ from oaipmh import server, common, metadata, error
 from catalogue.models import Book, Tag
 from api.models import Deleted
 from api.handlers import WL_BASE
 from catalogue.models import Book, Tag
 from api.models import Deleted
 from api.handlers import WL_BASE

-from librarian.dcparser import BookInfo

 from librarian import WLURI
 from django.contrib.contenttypes.models import ContentType
 from librarian import WLURI
 from django.contrib.contenttypes.models import ContentType

-from django.contrib.auth.models import User

 from datetime import datetime
 from lxml import etree
 from datetime import datetime
 from lxml import etree

-from lxml.etree import ElementTree
-from django.db.models import Q

 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.utils import timezone
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.utils import timezone


@@ -21,7 +17,7 @@ from django.utils import timezone
 
 make_time_naive = lambda d: timezone.localtime(d).replace(tzinfo=None)
 
 
 make_time_naive = lambda d: timezone.localtime(d).replace(tzinfo=None)
 

-WL_DC_READER_XPATH = '(.|*)/rdf:RDF/rdf:Description/%s/text()' 
+WL_DC_READER_XPATH = '(.|*)/rdf:RDF/rdf:Description/%s/text()'

 wl_dc_reader = metadata.MetadataReader(
     fields={
     'title':       ('textList', WL_DC_READER_XPATH % 'dc:title'),
 wl_dc_reader = metadata.MetadataReader(
     fields={
     'title':       ('textList', WL_DC_READER_XPATH % 'dc:title'),


@@ -114,7 +110,7 @@ class Catalogue(common.ResumptionOAIPMH):
     def identify(self, **kw):
         ident = common.Identify(
             'Wolne Lektury',  # generate
     def identify(self, **kw):
         ident = common.Identify(
             'Wolne Lektury',  # generate

-            '%s/oaipmh' % WL_BASE,  # generate
+            '%s/oaipmh' % unicode(WL_BASE),  # generate

             '2.0',  # version
             [m[1] for m in settings.MANAGERS],  # adminEmails
             make_time_naive(self.earliest_datestamp),  # earliest datestamp of any change
             '2.0',  # version
             [m[1] for m in settings.MANAGERS],  # adminEmails
             make_time_naive(self.earliest_datestamp),  # earliest datestamp of any change