test fix

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

diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index e203d0b..a1f2da3 100644 (file)
--- a/apps/oai/handlers.py
+++ b/apps/oai/handlers.py
@@ -10,7 +10,7 @@ from datetime import datetime
 from lxml import etree
 from lxml.etree import ElementTree
 from django.db.models import Q
 from lxml import etree
 from lxml.etree import ElementTree
 from django.db.models import Q

-
+from django.conf import settings

 
 wl_dc_reader = metadata.MetadataReader(
     fields={
 
 wl_dc_reader = metadata.MetadataReader(
     fields={


@@ -58,9 +58,6 @@ class Catalogue(common.ResumptionOAIPMH):
         self.earliest_datestamp = earliest_change <= earliest_delete and \
             earliest_change or earliest_delete
 
         self.earliest_datestamp = earliest_change <= earliest_delete and \
             earliest_change or earliest_delete
 

-        # admins
-        self.admin_emails = [u.email for u in User.objects.filter(is_superuser=True)]
-

     def metadata(self, book):
         xml = etree.parse(book.xml_file)
         md = wl_dc_reader(xml)
     def metadata(self, book):
         xml = etree.parse(book.xml_file)
         md = wl_dc_reader(xml)


@@ -89,7 +86,7 @@ class Catalogue(common.ResumptionOAIPMH):
             'Wolne Lektury',  # generate
             '%s/oaipmh' % WL_BASE,  # generate
             '2.0',  # version
             'Wolne Lektury',  # generate
             '%s/oaipmh' % WL_BASE,  # generate
             '2.0',  # version

-            self.admin_emails,  # adminEmails
+            [m[1] for m in settings.MANAGERS],  # adminEmails

             self.earliest_datestamp,  # earliest datestamp of any change
             'persistent',  # deletedRecord
             'YYYY-MM-DDThh:mm:ssZ',  # granularity
             self.earliest_datestamp,  # earliest datestamp of any change
             'persistent',  # deletedRecord
             'YYYY-MM-DDThh:mm:ssZ',  # granularity


@@ -101,7 +98,7 @@ class Catalogue(common.ResumptionOAIPMH):
     def books(self, tag, from_, until):
         if tag:
             # we do not support sets, since they are problematic for deleted books.
     def books(self, tag, from_, until):
         if tag:
             # we do not support sets, since they are problematic for deleted books.

-            raise errror.NoSetHierarchyError()
+            raise errror.NoSetHierarchyError("Wolne Lektury does not support sets.")

             # books = Book.tagged.with_all([tag])
         else:
             books = Book.objects.all()
             # books = Book.tagged.with_all([tag])
         else:
             books = Book.objects.all()


@@ -127,10 +124,10 @@ class Catalogue(common.ResumptionOAIPMH):
         cs = s.split(':')
         if len(cs) == 2:
             if not cs[0] in Catalogue.TAG_CATEGORIES:
         cs = s.split(':')
         if len(cs) == 2:
             if not cs[0] in Catalogue.TAG_CATEGORIES:

-                raise error.NoSetHierarchyError()
+                raise error.NoSetHierarchyError("No category part in set")

             tag = Tag.objects.get(slug=cs[1], category=cs[0])
             return tag
             tag = Tag.objects.get(slug=cs[1], category=cs[0])
             return tag

-        raise error.NoSetHierarchyError()
+        raise error.NoSetHierarchyError("Setspec should have two components: category:slug")

 
     def getRecord(self, **kw):
         """
 
     def getRecord(self, **kw):
         """


@@ -146,11 +143,10 @@ Returns (header, metadata, about) for given record.
                 deleted_book = Deleted.objects.get(content_type=book_type,
                                                   slug=slug)
             except:
                 deleted_book = Deleted.objects.get(content_type=book_type,
                                                   slug=slug)
             except:

-                raise error.NoRecordsMatchError()
+                raise error.IdDoesNotExistError("No item for this identifier")

             return self.record_for_book(deleted_book)
 
     def listIdentifiers(self, **kw):
             return self.record_for_book(deleted_book)
 
     def listIdentifiers(self, **kw):

-        print "list identifiers %s" % (kw, )

         records = [self.record_for_book(book, headers_only=True) for
                    book in self.books(None,
                            kw.get('from_', None),
         records = [self.record_for_book(book, headers_only=True) for
                    book in self.books(None,
                            kw.get('from_', None),


@@ -170,17 +166,18 @@ returns result, token
         return records, None
 
     def listMetadataFormats(self, **kw):
         return records, None
 
     def listMetadataFormats(self, **kw):

-        return [('oaidc',
+        return [('oai_dc',

                  'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
                  server.NS_OAIDC)]
 
     def listSets(self, **kw):
                  'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
                  server.NS_OAIDC)]
 
     def listSets(self, **kw):

-        tags = []
+        raise error.NoSetHierarchyError("Wolne Lektury does not support sets.")
+        # tags = []

         # for category in Catalogue.TAG_CATEGORIES:
         #     for tag in Tag.objects.filter(category=category):
         #         tags.append(("%s:%s" % (tag.category, tag.slug),
         #                      tag.name,
         #                      tag.description))
         # for category in Catalogue.TAG_CATEGORIES:
         #     for tag in Tag.objects.filter(category=category):
         #         tags.append(("%s:%s" % (tag.category, tag.slug),
         #                      tag.name,
         #                      tag.description))

-        return tags, None
+        # return tags, None