fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Up forms builder
[wolnelektury.git]
/
src
/
oai
/
handlers.py
diff --git
a/src/oai/handlers.py
b/src/oai/handlers.py
index
356f51b
..
7ac3f8f
100644
(file)
--- a/
src/oai/handlers.py
+++ b/
src/oai/handlers.py
@@
-1,13
+1,13
@@
-# This file is part of Wolne
l
ektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja
Nowoczesna Polska
. See NOTICE for more information.
+# This file is part of Wolne
L
ektury, 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 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 timezon
e
+from django.utils
.timezone import localtime, make_awar
e
from oaipmh import server, common, metadata, error
from api.handlers import WL_BASE
from oaipmh import server, common, metadata, error
from api.handlers import WL_BASE
@@
-17,7
+17,7
@@
from librarian import WLURI
def make_time_naive(d):
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(
WL_DC_READER_XPATH = '(.|*)/rdf:RDF/rdf:Description/%s/text()'
wl_dc_reader = metadata.MetadataReader(
@@
-65,10
+65,10
@@
class Catalogue(common.ResumptionOAIPMH):
self.oai_id = "oai:" + Site.objects.get_current().domain + ":%s"
# earliest change
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:
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')