add tag ramka

[wolnelektury.git] / src / search / views.py

diff --git a/src/search/views.py b/src/search/views.py
index 20b5e88..14da6f6 100644 (file)
--- a/src/search/views.py
+++ b/src/search/views.py
@@ -115,7 +115,7 @@ def hint(request):
                 break
             limit -= 1
             data.append({
                 break
             limit -= 1
             data.append({

-                'label': b.title,
+                'label': '<cite>%s</cite>, %s' % (b.title, b.author_unicode()),

                 'category': _('book'),
                 'id': b.id,
                 'url': b.get_absolute_url()
                 'category': _('book'),
                 'id': b.id,
                 'url': b.get_absolute_url()


@@ -135,7 +135,7 @@ def main(request):
     query = ' '.join(query.split())
     # filter out private use characters
     import unicodedata
     query = ' '.join(query.split())
     # filter out private use characters
     import unicodedata

-    query = ''.join(ch for ch in query if unicodedata.category(ch) == 'Co')
+    query = ''.join(ch for ch in query if unicodedata.category(ch) != 'Co')

 
     if len(query) < 2:
         return render_to_response(
 
     if len(query) < 2:
         return render_to_response(


@@ -222,7 +222,6 @@ def main(request):
     text_phrase = filter(ensure_exists, text_phrase)
     everywhere = filter(ensure_exists, everywhere)
 
     text_phrase = filter(ensure_exists, text_phrase)
     everywhere = filter(ensure_exists, everywhere)
 

-    results = author_results + translator_results + title_results + text_phrase + everywhere

     # ensure books do exists & sort them
     for res in (author_results, translator_results, title_results, text_phrase, everywhere):
         res.sort(reverse=True)
     # ensure books do exists & sort them
     for res in (author_results, translator_results, title_results, text_phrase, everywhere):
         res.sort(reverse=True)


@@ -235,7 +234,7 @@ def main(request):
     #         #frag = Fragment.objects.get(anchor=anchor)
     #         return HttpResponseRedirect(fragment_hits[0]['fragment'].get_absolute_url())
     #     return HttpResponseRedirect(results[0].book.get_absolute_url())
     #         #frag = Fragment.objects.get(anchor=anchor)
     #         return HttpResponseRedirect(fragment_hits[0]['fragment'].get_absolute_url())
     #     return HttpResponseRedirect(results[0].book.get_absolute_url())

-    if len(results) == 0:
+    if not (author_results or translator_results or title_results or text_phrase or everywhere):

         form = PublishingSuggestForm(initial={"books": query + ", "})
         return render_to_response(
             'catalogue/search_no_hits.html',
         form = PublishingSuggestForm(initial={"books": query + ", "})
         return render_to_response(
             'catalogue/search_no_hits.html',