X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..a87d0e99a355a5f36d7704b5cf1dc2d3f814b910:/src/search/views.py?ds=inline

diff --git a/src/search/views.py b/src/search/views.py
index c6759ea76..d105be6e9 100644
--- a/src/search/views.py
+++ b/src/search/views.py
@@ -115,7 +115,7 @@ def hint(request):
                 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()
@@ -132,11 +132,18 @@ def hint(request):
 @cache.never_cache
 def main(request):
     query = request.GET.get('q', '')
+    query = ' '.join(query.split())
+    # filter out private use characters
+    import unicodedata
+    query = ''.join(ch for ch in query if unicodedata.category(ch) != 'Co')
 
     if len(query) < 2:
         return render_to_response(
             'catalogue/search_too_short.html', {'prefix': query},
             context_instance=RequestContext(request))
+    elif len(query) > 256:
+        return render_to_response(
+            'catalogue/search_too_long.html', {'prefix': query}, context_instance=RequestContext(request))
 
     query = remove_query_syntax_chars(query)