X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/98a11b1afa8d82d4843705f6ffff799b1eeaed50..57e98a5807465f9494e5006e16860f16abbf4136:/apps/opds/views.py diff --git a/apps/opds/views.py b/apps/opds/views.py index 44baf5b2a..dc094bba7 100644 --- a/apps/opds/views.py +++ b/apps/opds/views.py @@ -18,7 +18,7 @@ from django.contrib.sites.models import Site from basicauth import logged_in_or_basicauth, factory_decorator from catalogue.models import Book, Tag -from search import MultiSearch, SearchResult, JVM +from search import Search, SearchResult, JVM from lucene import Term, QueryWrapperFilter, TermQuery import re @@ -234,7 +234,7 @@ class ByCategoryFeed(Feed): return feed['title'] def items(self, feed): - return (tag for tag in Tag.objects.filter(category=feed['category']) if tag.get_count() > 0) + return Tag.objects.filter(category=feed['category']).exclude(book_count=0) def item_title(self, item): return item.name @@ -285,7 +285,7 @@ class UserFeed(Feed): return u"Półki użytkownika %s" % user.username def items(self, user): - return (tag for tag in Tag.objects.filter(category='set', user=user) if tag.get_count() > 0) + return Tag.objects.filter(category='set', user=user).exclude(book_count=0) def item_title(self, item): return item.name @@ -376,7 +376,7 @@ class SearchFeed(AcquisitionFeed): fuzzy = False - srch = MultiSearch() + srch = Search() hint = srch.hint() # Scenario 1: full search terms provided.