Cutting stuff out.

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

diff --git a/src/oai/handlers.py b/src/oai/handlers.py
index 356f51b..d90a560 100644 (file)
--- a/src/oai/handlers.py
+++ b/src/oai/handlers.py
@@ -68,7 +68,7 @@ class Catalogue(common.ResumptionOAIPMH):
         year_zero = timezone.make_aware(datetime(1990, 1, 1, 0, 0, 0), timezone.utc)
 
         try:
         year_zero = timezone.make_aware(datetime(1990, 1, 1, 0, 0, 0), timezone.utc)
 
         try:

-            earliest_change = Book.objects.filter(preview=False).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
 
         except IndexError:
             earliest_change = year_zero
 


@@ -89,7 +89,7 @@ class Catalogue(common.ResumptionOAIPMH):
         md = wl_dc_reader(xml)
         m = md.getMap()
         if book.parent:
         md = wl_dc_reader(xml)
         m = md.getMap()
         if book.parent:

-            m['isPartOf'] = [str(WLURI.from_slug(book.parent.slug))]
+            m['isPartOf'] = [str(WLURI(book.parent.slug))]

         return m
 
     def record_for_book(self, book, headers_only=False):
         return m
 
     def record_for_book(self, book, headers_only=False):


@@ -132,7 +132,7 @@ class Catalogue(common.ResumptionOAIPMH):
             raise error.NoSetHierarchyError("Wolne Lektury does not support sets.")
             # books = Book.tagged.with_all([tag])
         else:
             raise error.NoSetHierarchyError("Wolne Lektury does not support sets.")
             # books = Book.tagged.with_all([tag])
         else:

-            books = Book.objects.filter(preview=False)
+            books = Book.objects.filter(findable=True, preview=False)

         deleted = Deleted.objects.exclude(slug__exact='')
 
         books = books.order_by('changed_at')
         deleted = Deleted.objects.exclude(slug__exact='')
 
         books = books.order_by('changed_at')