add retry option to reindex

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

diff --git a/apps/search/views.py b/apps/search/views.py
index 9818429..36dd52c 100644 (file)
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -168,17 +168,9 @@ def main(request):
                        ('text', text_phrase),
                        ('text', everywhere)]:
         res.sort(reverse=True)
-        print "get snips %s, res size %d" % (field, len(res))
         for r in res:
-            print "Get snippets for %s" % r
             search.get_snippets(r, query, field, 3)
-        # for r in res:
-        #     for h in r.hits:
-        #         h['snippets'] = map(lambda s:
-        #                             re.subn(r"(^[ \t\n]+|[ \t\n]+$)", u"",
-        #                                     re.subn(r"[ \t\n]*\n[ \t\n]*", u"\n", s)[0])[0], h['snippets'])
 
-    # suggestion = did_you_mean(query, search.get_tokens(toks, field="SIMPLE"))
     suggestion = u''
 
     def ensure_exists(r):
@@ -196,14 +188,15 @@ def main(request):
     # ensure books do exists & sort them
     results.sort(reverse=True)
 
-    if len(results) == 1:
-        fragment_hits = filter(lambda h: 'fragment' in h, results[0].hits)
-        if len(fragment_hits) == 1:
-            #anchor = fragment_hits[0]['fragment']
-            #frag = Fragment.objects.get(anchor=anchor)
-            return HttpResponseRedirect(fragment_hits[0]['fragment'].get_absolute_url())
-        return HttpResponseRedirect(results[0].book.get_absolute_url())
-    elif len(results) == 0:
+    # We don't want to redirect to book text, but rather display result page even with one result.
+    # if len(results) == 1:
+    #     fragment_hits = filter(lambda h: 'fragment' in h, results[0].hits)
+    #     if len(fragment_hits) == 1:
+    #         #anchor = fragment_hits[0]['fragment']
+    #         #frag = Fragment.objects.get(anchor=anchor)
+    #         return HttpResponseRedirect(fragment_hits[0]['fragment'].get_absolute_url())
+    #     return HttpResponseRedirect(results[0].book.get_absolute_url())
+    if len(results) == 0:
         form = PublishingSuggestForm(initial={"books": query + ", "})
         return render_to_response('catalogue/search_no_hits.html',
                                   {'tags': tags,