minor fixes

[wolnelektury.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 4601117..b32a310 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -7,6 +7,7 @@ import zipfile
 import sys
 import pprint
 import traceback
 import sys
 import pprint
 import traceback

+import re

 
 from django.conf import settings
 from django.template import RequestContext
 
 from django.conf import settings
 from django.template import RequestContext


@@ -22,6 +23,7 @@ from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode

+from django.utils.http import urlquote_plus

 from django.views.decorators import cache
 
 from catalogue import models
 from django.views.decorators import cache
 
 from catalogue import models


@@ -170,16 +172,24 @@ def book_text(request, slug):
 # ==========
 # = Search =
 # ==========
 # ==========
 # = Search =
 # ==========

+
+def _no_diacritics_regexp(query):
+    """ returns a regexp for searching for a query without diacritics
+    
+    should be locale-aware """
+    names = {'a':u'ą', 'c':u'ć', 'e':u'ę', 'l': u'ł', 'n':u'ń', 'o':u'ó', 's':u'ś', 'z':u'ź|ż'}
+    def repl(m):
+        l = m.group()
+        return "(%s|%s)" % (l, names[l])
+    return re.sub('[%s]'%(''.join(names.keys())), repl, query)
+

 def _word_starts_with(name, prefix):
     """returns a Q object getting models having `name` contain a word
     starting with `prefix`
     """
     kwargs = {}
     if settings.DATABASE_ENGINE in ('mysql', 'postgresql_psycopg2', 'postgresql'):
 def _word_starts_with(name, prefix):
     """returns a Q object getting models having `name` contain a word
     starting with `prefix`
     """
     kwargs = {}
     if settings.DATABASE_ENGINE in ('mysql', 'postgresql_psycopg2', 'postgresql'):

-        # we must escape `prefix` so that it only matches literally
-        for special in r'\^$.*+?|(){}[]':
-            prefix = prefix.replace(special, '\\' + special)
-        
+        prefix = _no_diacritics_regexp(re.escape(prefix))

         # we could use a [[:<:]] (word start), 
         # but we want both `xy` and `(xy` to catch `(xyz)`
         kwargs['%s__iregex' % name] = u"(^|[^[:alpha:]])%s" % prefix
         # we could use a [[:<:]] (word start), 
         # but we want both `xy` and `(xy` to catch `(xyz)`
         kwargs['%s__iregex' % name] = u"(^|[^[:alpha:]])%s" % prefix


@@ -216,6 +226,24 @@ def _tags_starting_with(prefix, user):
     return list(books) + list(tags) + list(book_stubs)
         
 
     return list(books) + list(tags) + list(book_stubs)
         
 

+
+def _get_result_link(match, tag_list):
+    if isinstance(match, models.Book) or isinstance(match, models.BookStub):
+        return match.get_absolute_url()
+    else:
+        return reverse('catalogue.views.tagged_object_list', 
+            kwargs={'tags': '/'.join(tag.slug for tag in tag_list + [match])}
+        )
+
+def _get_result_type(match):
+    if isinstance(match, models.Book) or isinstance(match, models.BookStub):
+        type = 'book'
+    else:
+        type = match.category
+    return dict(models.TAG_CATEGORIES)[type]
+    
+
+

 def search(request):
     tags = request.GET.get('tags', '')
     prefix = request.GET.get('q', '')
 def search(request):
     tags = request.GET.get('tags', '')
     prefix = request.GET.get('q', '')


@@ -227,38 +255,26 @@ def search(request):
 
     # Prefix must have at least 2 characters
     if len(prefix) < 2:
 
     # Prefix must have at least 2 characters
     if len(prefix) < 2:

-        return HttpResponseRedirect(reverse('catalogue.views.search_no_hits', 
-            kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
-        ))
+        return render_to_response('catalogue/search_too_short.html', {'tags':tag_list, 'prefix':prefix},
+            context_instance=RequestContext(request))

     
     result = _tags_exact_matches(prefix, request.user)
     
     result = _tags_exact_matches(prefix, request.user)

-    if (not result):
+    
+    if len(result) > 1:
+        # multiple exact matches
+        return render_to_response('catalogue/search_multiple_hits.html', 
+            {'tags':tag_list, 'prefix':prefix, 'results':((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result)},
+            context_instance=RequestContext(request))
+    
+    if not result:
+        # no exact matches

         result = _tags_starting_with(prefix, request.user)
     
         result = _tags_starting_with(prefix, request.user)
     

-    if len(result) > 0:
-        tag = result[0]
-        if isinstance(tag, models.Book) or isinstance(tag, models.BookStub):
-            return HttpResponseRedirect(tag.get_absolute_url())
-        else:
-            tag_list.append(tag)
-            
-            return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', 
-                kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
-            ))
+    if result:
+        return HttpResponseRedirect(_get_result_link(result[0], tag_list))

     else:
     else:

-        return HttpResponseRedirect(reverse('catalogue.views.search_no_hits', 
-            kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
-        ))
-
-
-def search_no_hits(request, tags):
-    try:
-        tag_list = models.Tag.get_tag_list(tags)
-    except:
-        tag_list = []
-
-    return render_to_response('catalogue/search_no_hits.html', {'tags':tag_list},
-        context_instance=RequestContext(request))
+        return render_to_response('catalogue/search_no_hits.html', {'tags':tag_list, 'prefix':prefix},
+            context_instance=RequestContext(request))

 
 
 def tags_starting_with(request):
 
 
 def tags_starting_with(request):


@@ -483,7 +499,7 @@ def register(request):
 @cache.never_cache
 def logout_then_redirect(request):
     auth.logout(request)
 @cache.never_cache
 def logout_then_redirect(request):
     auth.logout(request)

-    return HttpResponseRedirect(request.GET.get('next', '/'))
+    return HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))