fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #2035: Minor cite formatting issues.
[wolnelektury.git]
/
apps
/
search
/
templatetags
/
search_tags.py
diff --git
a/apps/search/templatetags/search_tags.py
b/apps/search/templatetags/search_tags.py
index
b19593e
..
a167f02
100644
(file)
--- a/
apps/search/templatetags/search_tags.py
+++ b/
apps/search/templatetags/search_tags.py
@@
-6,15
+6,11
@@
# import datetime
from django import template
# 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.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 django.utils.translation import ugettext as _
-from catalogue.templatetags.catalogue_tags import book_wide
from catalogue.models import Book
from catalogue.models import Book
+import re
# from catalogue.forms import SearchForm
# from catalogue.utils import split_tags
# from catalogue.forms import SearchForm
# from catalogue.utils import split_tags
@@
-38,14
+34,17
@@
def book_searched(context, result):
hits = filter(lambda (idx, h):
result.snippets[idx] is not None
or 'fragment' in h, enumerate(result.hits))
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))
+
#
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.
- if
'fragment' in hit
:
+ if
result.snippets[idx] is None
:
continue
snip = result.snippets[idx]
# fix some formattting
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('---', '—')
hit['snippet'] = snip
snip = snip.replace("\n", "<br />").replace('---', '—')
hit['snippet'] = snip
@@
-54,6
+53,6
@@
def book_searched(context, result):
'book': book,
'main_link': book.get_absolute_url(),
'request': context.get('request'),
'book': book,
'main_link': book.get_absolute_url(),
'request': context.get('request'),
- 'hits':
zip(*hits)[1
],
+ 'hits':
hits and zip(*hits)[1] or [
],
'main_link': book.get_absolute_url(),
}
'main_link': book.get_absolute_url(),
}