From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Wed, 11 Jan 2012 13:36:09 +0000 (+0100)
Subject: search - did you mean?
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/325a7f36de2b6f38c53f6e1dc103807f66944364?ds=inline;hp=--cc

search - did you mean?
---

325a7f36de2b6f38c53f6e1dc103807f66944364
diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 438df0729..655f1eccd 100644
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -36,10 +36,11 @@ class SearchForm(forms.Form):
     def __init__(self, source, *args, **kwargs):
         kwargs['auto_id'] = False
         super(SearchForm, self).__init__(*args, **kwargs)
-        self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre, phrase')
+        self.fields['q'].widget.attrs['id'] = _('search')
         self.fields['q'].widget.attrs['autocomplete'] = _('off')
         self.fields['q'].widget.attrs['data-source'] = _(source)
-        self.fields['q'].widget.attrs['id'] = _('search')
+        if not 'q' in self.data:
+            self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre, phrase')
 
 
 class UserSetsForm(forms.Form):
diff --git a/apps/search/views.py b/apps/search/views.py
index 166011cc3..d056a1826 100644
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from django.conf import settings
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
@@ -20,11 +21,21 @@ import enchant
 dictionary = enchant.Dict('pl_PL')
 
 
+def match_word_re(word):
+    if 'sqlite' in settings.DATABASES['default']['ENGINE']:
+        return r"\b%s\b" % word
+    elif 'mysql' in settings.DATABASES['default']['ENGINE']:
+        return "[[:<:]]%s[[:>:]]" % word
+
+
 def did_you_mean(query, tokens):
     change = {}
-    # sprawdzić, czy słowo nie jest aby autorem - proste szukanie termu w author!
     for t in tokens:
-        print("%s ok? %s, sug: %s" %(t, dictionary.check(t), dictionary.suggest(t)))
+        print("%s ok? %s, sug: %s" % (t, dictionary.check(t), dictionary.suggest(t)))
+        authors = Tag.objects.filter(category='author', name__iregex=match_word_re(t))
+        if len(authors) > 0:
+            continue
+        
         if not dictionary.check(t):
             try:
                 change[t] = dictionary.suggest(t)[0]
@@ -128,6 +139,9 @@ def main(request):
             for h in r.hits:
                 print "- %s" % h
 
+                # Did you mean?
+        suggestion = did_you_mean(query, srch.get_tokens(toks, field="SIMPLE"))
+
         if len(results) == 1:
             if len(results[0].hits) == 0:
                 return HttpResponseRedirect(results[0].book.get_absolute_url())
@@ -137,11 +151,15 @@ def main(request):
         elif len(results) == 0:
             form = PublishingSuggestForm(initial={"books": query + ", "})
             return render_to_response('catalogue/search_no_hits.html',
-                                      {'tags': tag_list, 'prefix': query,
-                                       "form": form},
+                                      {'tags': tag_list,
+                                       'prefix': query,
+                                       "form": form,
+                                       'did_you_mean': suggestion},
                 context_instance=RequestContext(request))
 
         return render_to_response('catalogue/search_multiple_hits.html',
-                                  {'tags': tag_list, 'prefix': query,
-                                   'results': results},
+                                  {'tags': tag_list,
+                                   'prefix': query,
+                                   'results': results,
+                                   'did_you_mean': suggestion},
             context_instance=RequestContext(request))
diff --git a/wolnelektury/templates/catalogue/search_multiple_hits.html b/wolnelektury/templates/catalogue/search_multiple_hits.html
index 40485f578..7a3e580b8 100644
--- a/wolnelektury/templates/catalogue/search_multiple_hits.html
+++ b/wolnelektury/templates/catalogue/search_multiple_hits.html
@@ -9,6 +9,9 @@
 {% block body %}
     <h1>{% trans "Search" %}</h1>
 
+    {% if did_you_mean %}
+      <span class="did_you_mean">{% trans "Dod you mean" %} <a href="{% url search %}?q={{did_you_mean|urlencode}}">{{did_you_mean|lower}}</a></b>?</span>
+    {% endif %}
     <div id="results">
       <ol>
       {% for result in results %}