fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove compatibility kludges around EbookField.
[wolnelektury.git]
/
src
/
oai
/
handlers.py
diff --git
a/src/oai/handlers.py
b/src/oai/handlers.py
index
16d7609
..
54a0a20
100644
(file)
--- a/
src/oai/handlers.py
+++ b/
src/oai/handlers.py
@@
-1,4
+1,3
@@
-# -*- 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 Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
@@
-69,13
+68,13
@@
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
try:
earliest_delete = \
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
except IndexError:
earliest_delete = year_zero
@@
-133,8
+132,8
@@
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)
- 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')
books = books.order_by('changed_at')
deleted = deleted.order_by('deleted_at')