X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/386957d4f29d34d557a62065575a40c83d7d3ede..fa9ab52217a8e6912fa4677fc7bb1da21044b470:/apps/search/templatetags/search_tags.py?ds=inline
diff --git a/apps/search/templatetags/search_tags.py b/apps/search/templatetags/search_tags.py
index 97deb9d13..6a2ccad44 100644
--- a/apps/search/templatetags/search_tags.py
+++ b/apps/search/templatetags/search_tags.py
@@ -35,18 +35,25 @@ def book_searched(context, result):
# We don't need hits which lead to sections but do not have
# snippets.
- hits = filter(lambda h: 'fragment' in h or
- h['snippets'], result.hits)[0:5]
-
- for hit in hits:
- hit['snippets'] = map(lambda s: s.replace("\n", "
").replace('---', '—'), hit['snippets'])
+ hits = filter(lambda (idx, h):
+ result.snippets[idx] is not None
+ or 'fragment' in h, enumerate(result.hits))
+ print "[tmpl: from %d hits selected %d]" % (len(result.hits), len(hits))
+
+ for (idx, hit) in hits:
+ # currently we generate one snipper per hit though.
+ if result.snippets[idx] is None:
+ continue
+ snip = result.snippets[idx]
+ # fix some formattting
+ snip = snip.replace("\n", "
").replace('---', '—')
+ hit['snippet'] = snip
return {
'related': book.related_info(),
'book': book,
'main_link': book.get_absolute_url(),
'request': context.get('request'),
- 'hits': hits,
+ 'hits': zip(*hits)[1],
'main_link': book.get_absolute_url(),
}
-