X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/48a8d1d73adefae7f0c58015494ce956d7cd70df..db85a925446ab8082ead1e84d13d2fcf57603e83:/src/oai/handlers.py?ds=inline diff --git a/src/oai/handlers.py b/src/oai/handlers.py index 16d760911..7ac3f8fea 100644 --- a/src/oai/handlers.py +++ b/src/oai/handlers.py @@ -1,14 +1,13 @@ -# -*- 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. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from datetime import datetime +from datetime import datetime, timezone from lxml import etree from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.contrib.sites.models import Site -from django.utils import timezone +from django.utils.timezone import localtime, make_aware from oaipmh import server, common, metadata, error from api.handlers import WL_BASE @@ -18,7 +17,7 @@ from librarian import WLURI def make_time_naive(d): - return timezone.localtime(d).replace(tzinfo=None) + return localtime(d).replace(tzinfo=None) WL_DC_READER_XPATH = '(.|*)/rdf:RDF/rdf:Description/%s/text()' wl_dc_reader = metadata.MetadataReader( @@ -66,16 +65,16 @@ class Catalogue(common.ResumptionOAIPMH): self.oai_id = "oai:" + Site.objects.get_current().domain + ":%s" # earliest change - year_zero = timezone.make_aware(datetime(1990, 1, 1, 0, 0, 0), timezone.utc) + year_zero = 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 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 @@ -90,7 +89,7 @@ class Catalogue(common.ResumptionOAIPMH): 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): @@ -133,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.filter(preview=False) - 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')