exclude '' slug not null

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

diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index 70e78c5..e37fc08 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={


@@ -52,15 +52,12 @@ class Catalogue(common.ResumptionOAIPMH):
 
         try:
             earliest_delete = \
 
         try:
             earliest_delete = \

-                Deleted.objects.ordery_by('deleted_at')[0].deleted_at
+                Deleted.objects.exclude(slug__exact=u'').ordery_by('deleted_at')[0].deleted_at

         except: earliest_delete = year_zero
 
         self.earliest_datestamp = earliest_change <= earliest_delete and \
             earliest_change or earliest_delete
 
         except: earliest_delete = year_zero
 
         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).exclude(email__exact=u'')]
-

     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


@@ -105,7 +102,7 @@ class Catalogue(common.ResumptionOAIPMH):
             # books = Book.tagged.with_all([tag])
         else:
             books = Book.objects.all()
             # books = Book.tagged.with_all([tag])
         else:
             books = Book.objects.all()

-        deleted = Deleted.objects.filter(slug__isnull=False)
+        deleted = Deleted.objects.exclude(slug__exact=u'')

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