fab conf fix

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

diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index 8b21f1c..a1f2da3 100644 (file)
--- a/apps/oai/handlers.py
+++ b/apps/oai/handlers.py
@@ -3,13 +3,14 @@ from catalogue.models import Book, Tag
 from api.models import Deleted
 from api.handlers import WL_BASE
 from librarian.dcparser import BookInfo
 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 django.contrib.auth.models import User
 from datetime import datetime
 from lxml import etree
 from lxml.etree import ElementTree
 from django.db.models import Q
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User
 from datetime import datetime
 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={


@@ -57,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)


@@ -67,46 +65,53 @@ class Catalogue(common.ResumptionOAIPMH):
 
     def record_for_book(self, book, headers_only=False):
         meta = None
 
     def record_for_book(self, book, headers_only=False):
         meta = None

+        identifier = str(WLURI.from_slug(book.slug))

         if isinstance(book, Book):
         if isinstance(book, Book):

-            header = common.Header(book.slug, book.changed_at, [], 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
         elif isinstance(book, Deleted):
             if not headers_only:
                 meta = common.Metadata(self.metadata(book))
             about = None
         elif isinstance(book, Deleted):

-            header = common.Header(book.slug, book.deleted_at, [], True)
+            header = common.Header(identifier, book.deleted_at, [], True)

             if not headers_only:
                 meta = common.Metadata({})
             about = None
             if not headers_only:
                 meta = common.Metadata({})
             about = None

+        if headers_only:
+            return header

         return header, meta, about
 
     def identify(self, **kw):
         ident = common.Identify(
             'Wolne Lektury',  # generate
             '%s/oaipmh' % WL_BASE,  # generate
         return header, meta, about
 
     def identify(self, **kw):
         ident = common.Identify(
             'Wolne Lektury',  # generate
             '%s/oaipmh' % WL_BASE,  # generate

-            '1.1',  # version
-            self.admin_emails,  # adminEmails
+            '2.0',  # version
+            [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

-            'identity',  # compression
+            ['identity'],  # compression

             []  # descriptions
             )
         return ident
 
     def books(self, tag, from_, until):
         if tag:
             []  # descriptions
             )
         return ident
 
     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()
         else:
             books = Book.objects.all()

-        deleted = Deleted.objects.all()
+        deleted = Deleted.objects.filter(slug__isnull=False)

 
         books = books.order_by('changed_at')
 
         books = books.order_by('changed_at')

+        deleted = deleted.order_by('deleted_at')

         if from_:
             books = books.filter(changed_at__gte=from_)
             deleted = deleted.filter(deleted_at__gte=from_)
         if until:
             books = books.filter(changed_at__lte=until)
         if from_:
             books = books.filter(changed_at__gte=from_)
             deleted = deleted.filter(deleted_at__gte=from_)
         if until:
             books = books.filter(changed_at__lte=until)

-            deleted = deleted.filter(deleted_at__gte=until)
+            deleted = deleted.filter(deleted_at__lte=until)

         return list(books) + list(deleted)
 
     @staticmethod
         return list(books) + list(deleted)
 
     @staticmethod


@@ -119,16 +124,16 @@ 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):
         """
 Returns (header, metadata, about) for given record.
         """
 
     def getRecord(self, **kw):
         """
 Returns (header, metadata, about) for given record.
         """

-        slug = kw['record']
+        slug = WLURI(kw['identifier']).slug

         try:
             book = Book.objects.get(slug=slug)
             return self.record_for_book(book)
         try:
             book = Book.objects.get(slug=slug)
             return self.record_for_book(book)


@@ -138,17 +143,15 @@ 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):
         records = [self.record_for_book(book, headers_only=True) for
             return self.record_for_book(deleted_book)
 
     def listIdentifiers(self, **kw):
         records = [self.record_for_book(book, headers_only=True) for

-                   book in self.books(
-                       self.setspec_to_tag(
-                           kw.get('set', None)),
-                           kw.get('from', None),
+                   book in self.books(None,
+                           kw.get('from_', None),

                            kw.get('until', None))]
                            kw.get('until', None))]

-        return records
+        return records, None

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


@@ -156,24 +159,25 @@ can get a resumptionToken kw.
 returns result, token
         """
         records = [self.record_for_book(book) for
 returns result, token
         """
         records = [self.record_for_book(book) for

-                   book in self.books(
-                       self.setspec_to_tag(
-                           kw.get('set', None)),
-                           kw.get('from', None),
+                   book in self.books(None,
+                           kw.get('from_', None),

                            kw.get('until', None))]
 
         return records, None
 
     def listMetadataFormats(self, **kw):
                            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):
                  '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
+        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
+
+