search input field,

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

diff --git a/apps/search/views.py b/apps/search/views.py
index 6dcaf74..166011c 100644 (file)
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -8,11 +8,10 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpRespons
 from django.utils.translation import ugettext as _
 
 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 import forms
-from search import MultiSearch, JVM, SearchResult
+from search import Search, JVM, SearchResult
 from lucene import StringReader
 from suggest.forms import PublishingSuggestForm
 
@@ -46,7 +45,7 @@ def hint(request):
     if len(prefix) < 2:
         return JSONResponse([])
     JVM.attachCurrentThread()
-    s = MultiSearch()
+    s = Search()
 
     hint = s.hint()
     try:
@@ -60,7 +59,6 @@ def hint(request):
     # jezeli tagi dot tylko ksiazki, to wazne zeby te nowe byly w tej samej ksiazce
     # jesli zas dotycza themes, to wazne, zeby byly w tym samym fragmencie.
 
-    
     tags = s.hint_tags(prefix)
     books = s.hint_books(prefix)
 
@@ -79,22 +77,10 @@ def hint(request):
             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?
-    srch = MultiSearch()
+    srch = Search()
 
     results = None
     query = None
@@ -128,12 +114,19 @@ def main(request):
             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))
+
+        for r in results:
+            r.process_hits()
+
         results.sort(reverse=True)
 
         for r in results:
-            print r.hits
+            print "-----"
+            for h in r.hits:
+                print "- %s" % h
 
         if len(results) == 1:
             if len(results[0].hits) == 0:
@@ -144,17 +137,11 @@ 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, "pubsuggest_form": form,
-                                       'form': forms.SearchForm()},
+                                      {'tags': tag_list, 'prefix': query,
+                                       "form": form},
                 context_instance=RequestContext(request))
 
         return render_to_response('catalogue/search_multiple_hits.html',
                                   {'tags': tag_list, 'prefix': query,
-                                   'results': results, 'from': forms.SearchForm()},
+                                   'results': results},
             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))