X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/55bc643c16dc56cf2377bd5c4d6e924d5fc62698..82c3054bcdeb000aa9782da80d644070797b5cbe:/apps/search/templatetags/search_tags.py

diff --git a/apps/search/templatetags/search_tags.py b/apps/search/templatetags/search_tags.py
index 03e33c8d2..8dbad9dae 100644
--- a/apps/search/templatetags/search_tags.py
+++ b/apps/search/templatetags/search_tags.py
@@ -6,15 +6,11 @@
 # import datetime
 
 from django import template
-from django.template import Node, Variable
-from django.utils.encoding import smart_str
-from django.core.urlresolvers import reverse
 # from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 # from django.db.models import Q
-from django.conf import settings
 # from django.utils.translation import ugettext as _
-from catalogue.templatetags.catalogue_tags import book_wide
 from catalogue.models import Book
+import re
 # from catalogue.forms import SearchForm
 # from catalogue.utils import split_tags
 
@@ -22,10 +18,9 @@ from catalogue.models import Book
 register = template.Library()
 
 
-@register.inclusion_tag('catalogue/book_searched.html')
-def book_searched(result):
+@register.inclusion_tag('catalogue/book_searched.html', takes_context=True)
+def book_searched(context, result):
     book = Book.objects.get(pk=result.book_id)
-    vals = book_wide(book)
 
     # snippets = []
     # for hit in result.hits:
@@ -36,10 +31,25 @@ def book_searched(result):
 
     # We don't need hits which lead to sections but do not have
     # snippets.
-    vals['hits'] = filter(lambda h: 'fragment' in h or
-                          h['snippets'], result.hits)
-
-    for hit in vals['hits']:
-        hit['snippets'] = map(lambda s: s.replace("\n", "<br />").replace('---', '&mdash;'), hit['snippets'])
-
-    return vals
+    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 = re.subn(r"(^[ \t\n]+|[ \t\n]+$)", u"",
+                              re.subn(r"[ \t\n]*\n[ \t\n]*", u"\n", snip)[0])[0]
+
+        snip = snip.replace("\n", "<br />").replace('---', '&mdash;')
+        hit['snippet'] = snip
+
+    return {
+        'request': context['request'],
+        'book': book,
+        'hits':  hits and zip(*hits)[1] or []
+    }