X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9a938c8b406ce05e3bca4a5a483d473ece9e17b0..9c2555ad140dca1c09cde628bd22aac811e05b7e:/src/oai/handlers.py

diff --git a/src/oai/handlers.py b/src/oai/handlers.py
index 6d0a9b216..54a0a20bc 100644
--- a/src/oai/handlers.py
+++ b/src/oai/handlers.py
@@ -1,4 +1,3 @@
-# -*- 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.
 #
@@ -56,7 +55,6 @@ def nsdcterms(name):
     return '{%s}%s' % (NS_DCTERMS, name)
 
 
-# WTF
 class Catalogue(common.ResumptionOAIPMH):
     TAG_CATEGORIES = ['author', 'epoch', 'kind', 'genre']
 
@@ -70,13 +68,13 @@ class Catalogue(common.ResumptionOAIPMH):
         year_zero = timezone.make_aware(datetime(1990, 1, 1, 0, 0, 0), timezone.utc)
 
         try:
-            earliest_change = Book.objects.order_by('changed_at')[0].changed_at
+            earliest_change = Book.objects.filter(findable=True, preview=False).order_by('changed_at')[0].changed_at
         except IndexError:
             earliest_change = year_zero
 
         try:
             earliest_delete = \
-                Deleted.objects.exclude(slug__exact=u'').order_by('deleted_at')[0].deleted_at
+                Deleted.objects.exclude(slug__exact='').order_by('deleted_at')[0].deleted_at
         except IndexError:
             earliest_delete = year_zero
 
@@ -99,14 +97,14 @@ class Catalogue(common.ResumptionOAIPMH):
         identifier = self.slug_to_identifier(book.slug)
         if isinstance(book, Book):
             # setSpec = map(self.tag_to_setspec, book.tags.filter(category__in=self.TAG_CATEGORIES))
-            header = common.Header(identifier, make_time_naive(book.changed_at), [], False)
+            header = common.Header(None, identifier, make_time_naive(book.changed_at), [], False)
             if not headers_only:
-                meta = common.Metadata(self.metadata(book))
+                meta = common.Metadata(None, self.metadata(book))
             about = None
         elif isinstance(book, Deleted):
-            header = common.Header(identifier, make_time_naive(book.deleted_at), [], True)
+            header = common.Header(None, identifier, make_time_naive(book.deleted_at), [], True)
             if not headers_only:
-                meta = common.Metadata({})
+                meta = common.Metadata(None, {})
             about = None
         else:
             raise TypeError('Unknown book class')
@@ -117,7 +115,7 @@ class Catalogue(common.ResumptionOAIPMH):
     def identify(self, **kw):
         ident = common.Identify(
             'Wolne Lektury',  # generate
-            '%s/oaipmh' % unicode(WL_BASE),  # generate
+            '%s/oaipmh' % str(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
@@ -134,8 +132,8 @@ class Catalogue(common.ResumptionOAIPMH):
             raise error.NoSetHierarchyError("Wolne Lektury does not support sets.")
             # books = Book.tagged.with_all([tag])
         else:
-            books = Book.objects.all()
-        deleted = Deleted.objects.exclude(slug__exact=u'')
+            books = Book.objects.filter(findable=True, preview=False)
+        deleted = Deleted.objects.exclude(slug__exact='')
 
         books = books.order_by('changed_at')
         deleted = deleted.order_by('deleted_at')