Some fixes in the importer.

[osqa.git] / forum_modules / pgfulltext / handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 45ab2e781888d0118dfbde9457868e28fc73ebd1..835c2f5dd76e463fc25fed9e5ddfc25ad61f2ab5 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,15 @@
 from forum.models import Question
+from forum.modules.decorators import decorate
+from forum.views.readers import do_question_search
 
+@decorate(do_question_search, needs_origin=False)
 def question_search(keywords):
-    return Question.objects.extra(
+    return Question.objects.all().extra(
                     select={
-                        'ranking': "ts_rank_cd(tsv, plainto_tsquery(%s), 32)",
+                        'ranking': 'node_ranking("forum_node"."id", %s)',
                     },
-                    where=["tsv @@ plainto_tsquery(%s)"],
+                    where=['node_ranking("forum_node"."id", %s) > 0'],
                     params=[keywords],
-                    select_params=[keywords]
-                ).order_by('-ranking')
\ No newline at end of file
+                    select_params=[keywords],
+                    order_by=['-ranking']
+                )
\ No newline at end of file