From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 4 Jul 2013 13:39:18 +0000 (+0200)
Subject: Feed only naive time to oaipmh,
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/14c90138f071d90f241d3cae13d3409d81c04599?ds=sidebyside;hp=-c

Feed only naive time to oaipmh,
Fix a bug for living authors in pdcounter.
---

14c90138f071d90f241d3cae13d3409d81c04599
diff --git a/apps/oai/handlers.py b/apps/oai/handlers.py
index eabb59c9f..4e3fefcb2 100644
--- a/apps/oai/handlers.py
+++ b/apps/oai/handlers.py
@@ -15,6 +15,8 @@ from django.contrib.sites.models import Site
 from django.utils import timezone
 
 
+make_time_naive = lambda d: timezone.localtime(d).replace(tzinfo=None)
+
 WL_DC_READER_XPATH = '(.|*)/rdf:RDF/rdf:Description/%s/text()' 
 wl_dc_reader = metadata.MetadataReader(
     fields={
@@ -92,12 +94,12 @@ 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, book.changed_at, [], False)
+            header = common.Header(identifier, make_time_naive(book.changed_at), [], False)
             if not headers_only:
                 meta = common.Metadata(self.metadata(book))
             about = None
         elif isinstance(book, Deleted):
-            header = common.Header(identifier, book.deleted_at, [], True)
+            header = common.Header(identifier, make_time_naive(book.deleted_at), [], True)
             if not headers_only:
                 meta = common.Metadata({})
             about = None
@@ -111,7 +113,7 @@ class Catalogue(common.ResumptionOAIPMH):
             '%s/oaipmh' % WL_BASE,  # generate
             '2.0',  # version
             [m[1] for m in settings.MANAGERS],  # adminEmails
-            self.earliest_datestamp,  # earliest datestamp of any change
+            make_time_naive(self.earliest_datestamp),  # earliest datestamp of any change
             'persistent',  # deletedRecord
             'YYYY-MM-DDThh:mm:ssZ',  # granularity
             ['identity'],  # compression
diff --git a/apps/pdcounter/views.py b/apps/pdcounter/views.py
index 8fb1b13fa..edad76b75 100644
--- a/apps/pdcounter/views.py
+++ b/apps/pdcounter/views.py
@@ -22,7 +22,8 @@ def book_stub_detail(request, slug):
 
 def author_detail(request, slug):
     author = get_object_or_404(models.Author, slug=slug)
-    pd_counter = datetime(author.goes_to_pd(), 1, 1)
+    if not author.alive:
+        pd_counter = datetime(author.goes_to_pd(), 1, 1)
 
     form = PublishingSuggestForm(initial={"books": author.name + ", \n"})