fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce DRF and start replacing the views.
[wolnelektury.git]
/
src
/
search
/
templatetags
/
search_tags.py
diff --git
a/src/search/templatetags/search_tags.py
b/src/search/templatetags/search_tags.py
index
8302379
..
d0cbb5c
100644
(file)
--- a/
src/search/templatetags/search_tags.py
+++ b/
src/search/templatetags/search_tags.py
@@
-2,40
+2,20
@@
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
# 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 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
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):
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)
-
- # snippets = []
- # for hit in result.hits:
- # if hit['snippets']:
- # snippets.append(hit['snippets'])
- # elif hit['fragment']:
- # snippets.append(hit['fragment'].short_text)
-
# We don't need hits which lead to sections but do not have
# snippets.
hits = filter(lambda (idx, h):
# We don't need hits which lead to sections but do not have
# snippets.
hits = filter(lambda (idx, h):
- 'fragment' in h or
- result.snippets[idx] is not None,
+ result.snippets[idx] is not None or ('fragment' in h and h['themes_hit']),
enumerate(result.hits))
enumerate(result.hits))
-
#
print "[tmpl: from %d hits selected %d]" % (len(result.hits), len(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.
for (idx, hit) in hits:
# currently we generate one snipper per hit though.
@@
-45,14
+25,14
@@
def book_searched(context, result):
continue
snip = result.snippets[idx]
# fix some formattting
continue
snip = result.snippets[idx]
# fix some formattting
- snip = re.sub
n(r"(^[ \t\n]+|[ \t\n]+$)", u"",
- re.subn(r"[ \t\n]*\n[ \t\n]*", u"\n", snip)[0])[0]
+ snip = re.sub
(r"[ \t\n]*\n[ \t\n]*", u"\n", snip)
+ snip = re.sub(r"(^[ \t\n]+|[ \t\n]+$)", u"", snip)
snip = snip.replace("\n", "<br />").replace('---', '—')
hit['snippet'] = snip
return {
'request': context['request'],
snip = snip.replace("\n", "<br />").replace('---', '—')
hit['snippet'] = snip
return {
'request': context['request'],
- 'book': book,
- 'hits':
hits and zip(*hits)[1] or
[]
+ 'book':
result.
book,
+ 'hits':
zip(*hits)[1] if hits else
[]
}
}