X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5eeb9dace6068f83e2b70b5222cfab0c0a5e71eb..82cef4d2af27243f4f4c33bafd9e1c2447d41895:/apps/opds/views.py diff --git a/apps/opds/views.py b/apps/opds/views.py index e01c17283..ec93da138 100644 --- a/apps/opds/views.py +++ b/apps/opds/views.py @@ -259,7 +259,7 @@ class ByTagFeed(AcquisitionFeed): def items(self, tag): books = Book.tagged.with_any([tag]) - l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books]) + l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books.iterator()]) descendants_keys = [book.pk for book in Book.tagged.with_any(l_tags)] if descendants_keys: books = books.exclude(pk__in=descendants_keys) @@ -370,6 +370,11 @@ class SearchFeed(AcquisitionFeed): author = request.GET.get('author', '') title = request.GET.get('title', '') translator = request.GET.get('translator', '') + + # Our client didn't handle the opds placeholders + if author == '{atom:author}': author = '' + if title == '{atom:title}': title = '' + if translator == '{atom:contributor}': translator = '' categories = None fuzzy = False