From: Marcin Koziej Date: Mon, 2 Apr 2012 10:23:49 +0000 (+0200) Subject: Merge branch 'master' of github.com:fnp/wolnelektury X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/e5e8226c4d4bd610de5983e69b1b13684a17fe75?ds=inline;hp=-c Merge branch 'master' of github.com:fnp/wolnelektury --- e5e8226c4d4bd610de5983e69b1b13684a17fe75 diff --combined apps/opds/views.py index bb38b7b6b,5a9e44a41..ec93da138 --- a/apps/opds/views.py +++ b/apps/opds/views.py @@@ -259,7 -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,11 -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