X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a728fedba796dcf8d969c6f96def0f630d05f2f9..8775731643fbbd274ebc14714abb60d609bd9219:/apps/oai/handlers.py?ds=inline

diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index 9e00b2164..70e78c5fb 100644
--- a/apps/oai/handlers.py
+++ b/apps/oai/handlers.py
@@ -59,7 +59,7 @@ class Catalogue(common.ResumptionOAIPMH):
             earliest_change or earliest_delete
 
         # admins
-        self.admin_emails = [u.email for u in User.objects.filter(is_superuser=True)]
+        self.admin_emails = [u.email for u in User.objects.filter(is_superuser=True).exclude(email__exact=u'')]
 
     def metadata(self, book):
         xml = etree.parse(book.xml_file)
@@ -70,8 +70,8 @@ class Catalogue(common.ResumptionOAIPMH):
         meta = None
         identifier = str(WLURI.from_slug(book.slug))
         if isinstance(book, Book):
-            setSpec = map(self.tag_to_setspec, book.tags.filter(category__in=self.TAG_CATEGORIES))
-            header = common.Header(identifier, book.changed_at, setSpec, False)
+            #            setSpec = map(self.tag_to_setspec, book.tags.filter(category__in=self.TAG_CATEGORIES))
+            header = common.Header(identifier, book.changed_at, [], False)
             if not headers_only:
                 meta = common.Metadata(self.metadata(book))
             about = None
@@ -100,7 +100,9 @@ class Catalogue(common.ResumptionOAIPMH):
 
     def books(self, tag, from_, until):
         if tag:
-            books = Book.tagged.with_all([tag])
+            # we do not support sets, since they are problematic for deleted books.
+            raise errror.NoSetHierarchyError("Wolne Lektury does not support sets.")
+            # books = Book.tagged.with_all([tag])
         else:
             books = Book.objects.all()
         deleted = Deleted.objects.filter(slug__isnull=False)
@@ -110,7 +112,6 @@ class Catalogue(common.ResumptionOAIPMH):
         if from_:
             books = books.filter(changed_at__gte=from_)
             deleted = deleted.filter(deleted_at__gte=from_)
-            print "DELETED:%s" % deleted
         if until:
             books = books.filter(changed_at__lte=until)
             deleted = deleted.filter(deleted_at__lte=until)
@@ -126,10 +127,10 @@ class Catalogue(common.ResumptionOAIPMH):
         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
-        raise error.NoSetHierarchyError()
+        raise error.NoSetHierarchyError("Setspec should have two components: category:slug")
 
     def getRecord(self, **kw):
         """
@@ -145,15 +146,12 @@ Returns (header, metadata, about) for given record.
                 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):
-        print "list identifiers %s" % (kw, )
         records = [self.record_for_book(book, headers_only=True) for
-                   book in self.books(
-                       self.setspec_to_tag(
-                           kw.get('set', None)),
+                   book in self.books(None,
                            kw.get('from_', None),
                            kw.get('until', None))]
         return records, None
@@ -164,26 +162,25 @@ can get a resumptionToken kw.
 returns result, token
         """
         records = [self.record_for_book(book) for
-                   book in self.books(
-                       self.setspec_to_tag(
-                           kw.get('set', None)),
+                   book in self.books(None,
                            kw.get('from_', None),
                            kw.get('until', None))]
 
         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):
-        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))
-        return tags, None
+        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))
+        # return tags, None