Improvements on full text search.

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 2b57e96efe699bca3b6f45a81dfb5b44c1ab7541..e1d98f20877875e6ac958a0b0862c41ee031f38d 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,13 +1,12 @@
-from forum.models import Question
+from forum.models.question import Question, QuestionManager
 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.all().extra(
+@decorate(QuestionManager.search, needs_origin=False)
+def question_search(self, keywords):
+    return self.extra(
                     tables=['forum_rootnode_doc'],
                     select={
-                        'ranking': 'ts_rank_cd("forum_rootnode_doc"."document", plainto_tsquery(\'english\', %s), 32)',
+                        'ranking': 'ts_rank_cd(\'{0.1, 0.2, 0.8, 1.0}\'::float4[], "forum_rootnode_doc"."document", plainto_tsquery(\'english\', %s), 32)',
                     },
                     where=['"forum_rootnode_doc"."node_id" = "forum_node"."id"', '"forum_rootnode_doc"."document" @@ plainto_tsquery(\'english\', %s)'],
                     params=[keywords],