Merge branch 'production' into pretty

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

diff --git a/apps/search/views.py b/apps/search/views.py
index 438989c..d056a18 100644 (file)
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 
 # -*- 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
 from django.views.decorators import cache
 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 from django.views.decorators import cache
 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect

+from django.utils.translation import ugettext as _

 
 from catalogue.utils import get_random_hash
 
 from catalogue.utils import get_random_hash

-from catalogue.models import Book, Tag, Fragment, TAG_CATEGORIES
+from catalogue.models import Book, Tag, Fragment

 from catalogue.fields import dumps
 from catalogue.views import JSONResponse
 from catalogue.fields import dumps
 from catalogue.views import JSONResponse

-from catalogue import forms
-from search import MultiSearch, JVM, SearchResult
+from search import Search, JVM, SearchResult

 from lucene import StringReader
 from suggest.forms import PublishingSuggestForm
 
 from lucene import StringReader
 from suggest.forms import PublishingSuggestForm
 


@@ -20,11 +21,21 @@ import enchant
 dictionary = enchant.Dict('pl_PL')
 
 
 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 = {}
 def did_you_mean(query, tokens):
     change = {}

-    # sprawdzić, czy słowo nie jest aby autorem - proste szukanie termu w author!

     for t in tokens:
     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]
         if not dictionary.check(t):
             try:
                 change[t] = dictionary.suggest(t)[0]


@@ -40,19 +51,12 @@ def did_you_mean(query, tokens):
     return query
 
 
     return query
 
 

-def category_name(category):
-    try:
-        return filter(lambda c: c[0] == category, TAG_CATEGORIES)[0][1].encode('utf-8')
-    except IndexError:
-        raise KeyError("No category %s" % category)
-
-

 def hint(request):
     prefix = request.GET.get('term', '')
     if len(prefix) < 2:
 def hint(request):
     prefix = request.GET.get('term', '')
     if len(prefix) < 2:

-        return JSONResponse(dumps(None))
+        return JSONResponse([])

     JVM.attachCurrentThread()
     JVM.attachCurrentThread()

-    s = MultiSearch()
+    s = Search()

 
     hint = s.hint()
     try:
 
     hint = s.hint()
     try:


@@ -73,33 +77,21 @@ def hint(request):
 
     return JSONResponse(
         [{'label': t.name,
 
     return JSONResponse(
         [{'label': t.name,

-          'category': category_name(t.category),
+          'category': _(t.category),

           'id': t.id,
           'url': t.get_absolute_url()}
           for t in tags] + \
           [{'label': b.title,
           'id': t.id,
           'url': t.get_absolute_url()}
           for t in tags] + \
           [{'label': b.title,

-            'category': category_name('book'),
+            'category': _('book'),

             'id': b.id,
             'url': b.get_absolute_url()}
             for b in books])
 
 
             'id': b.id,
             'url': b.get_absolute_url()}
             for b in books])
 
 

-def foo(s, q, tag_list=None):
-    hint = s.hint()
-    try:
-        tag_list = Tag.get_tag_list(tag_list)
-        hint.tags(tag_list)
-    except:
-        tag_list = None
-
-    q = StringReader(q)
-    return (q, hint)
-
-

 def main(request):
     results = {}
     JVM.attachCurrentThread()  # where to put this?
 def main(request):
     results = {}
     JVM.attachCurrentThread()  # where to put this?

-    srch = MultiSearch()
+    srch = Search()

 
     results = None
     query = None
 
     results = None
     query = None


@@ -108,7 +100,7 @@ def main(request):
     if 'q' in request.GET:
         tags = request.GET.get('tags', '')
         query = request.GET['q']
     if 'q' in request.GET:
         tags = request.GET.get('tags', '')
         query = request.GET['q']

-        book_id = request.get('book', None)
+        book_id = request.GET.get('book', None)

         book = None
         if book_id is not None:
             book = get_object_or_404(Book, id=book_id)
         book = None
         if book_id is not None:
             book = get_object_or_404(Book, id=book_id)


@@ -124,7 +116,8 @@ def main(request):
                                       context_instance=RequestContext(request))
 
         hint.tags(tag_list)
                                       context_instance=RequestContext(request))
 
         hint.tags(tag_list)

-        hint.book(book)
+        if book:
+            hint.books(book)

 
         toks = StringReader(query)
         fuzzy = 'fuzzy' in request.GET
 
         toks = StringReader(query)
         fuzzy = 'fuzzy' in request.GET


@@ -132,12 +125,22 @@ def main(request):
             fuzzy = 0.7
 
         results = SearchResult.aggregate(srch.search_perfect_book(toks, fuzzy=fuzzy, hint=hint),
             fuzzy = 0.7
 
         results = SearchResult.aggregate(srch.search_perfect_book(toks, fuzzy=fuzzy, hint=hint),

+                                         srch.search_book(toks, fuzzy=fuzzy, hint=hint),

                                          srch.search_perfect_parts(toks, fuzzy=fuzzy, hint=hint),
                                          srch.search_everywhere(toks, fuzzy=fuzzy, hint=hint))
                                          srch.search_perfect_parts(toks, fuzzy=fuzzy, hint=hint),
                                          srch.search_everywhere(toks, fuzzy=fuzzy, hint=hint))

+
+        for r in results:
+            r.process_hits()
+

         results.sort(reverse=True)
 
         for r in results:
         results.sort(reverse=True)
 
         for r in results:

-            print r.hits
+            print "-----"
+            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:
 
         if len(results) == 1:
             if len(results[0].hits) == 0:


@@ -148,17 +151,15 @@ def main(request):
         elif len(results) == 0:
             form = PublishingSuggestForm(initial={"books": query + ", "})
             return render_to_response('catalogue/search_no_hits.html',
         elif len(results) == 0:
             form = PublishingSuggestForm(initial={"books": query + ", "})
             return render_to_response('catalogue/search_no_hits.html',

-                                      {'tags': tag_list, 'prefix': query, "pubsuggest_form": form,
-                                       'form': forms.SearchForm()},
+                                      {'tags': tag_list,
+                                       'prefix': query,
+                                       "form": form,
+                                       'did_you_mean': suggestion},

                 context_instance=RequestContext(request))
 
         return render_to_response('catalogue/search_multiple_hits.html',
                 context_instance=RequestContext(request))
 
         return render_to_response('catalogue/search_multiple_hits.html',

-                                  {'tags': tag_list, 'prefix': query,
-                                   'results': results, 'from': forms.SearchForm()},
+                                  {'tags': tag_list,
+                                   'prefix': query,
+                                   'results': results,
+                                   'did_you_mean': suggestion},

             context_instance=RequestContext(request))
             context_instance=RequestContext(request))

-
-    # return render_to_response('newsearch/search.html', {'results': results,
-    #                                                     'did_you_mean': (query is not None) and
-    #                                                     did_you_mean(query, srch.get_tokens(query, field='SIMPLE')),
-    #                                                     'fuzzy': fuzzy},
-    #                           context_instance=RequestContext(request))