X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/05e5b36046d980e84776978660f420b008db4879..967eed676fc83d15b26149047f353ac61faa8217:/src/search/templatetags/search_tags.py diff --git a/src/search/templatetags/search_tags.py b/src/search/templatetags/search_tags.py index da5a85bc7..0975c2a28 100644 --- a/src/search/templatetags/search_tags.py +++ b/src/search/templatetags/search_tags.py @@ -2,29 +2,17 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -# import feedparser -# import datetime - from django import template -# from django.contrib.auth.forms import UserCreationForm, AuthenticationForm -# from django.db.models import Q -# from django.utils.translation import ugettext as _ -from catalogue.models import Book import re -# from catalogue.forms import SearchForm -# from catalogue.utils import split_tags - register = template.Library() @register.inclusion_tag('catalogue/book_searched.html', takes_context=True) def book_searched(context, result): - book = Book.objects.get(pk=result.book_id) - # We don't need hits which lead to sections but do not have # snippets. - hits = filter(lambda (idx, h): + hits = filter(lambda idx, h: result.snippets[idx] is not None or ('fragment' in h and h['themes_hit']), enumerate(result.hits)) # print "[tmpl: from %d hits selected %d]" % (len(result.hits), len(hits)) @@ -45,6 +33,6 @@ def book_searched(context, result): return { 'request': context['request'], - 'book': book, + 'book': result.book, 'hits': zip(*hits)[1] if hits else [] }