Delted questions were not updating tag count.

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 45ab2e781888d0118dfbde9457868e28fc73ebd1..e1d98f20877875e6ac958a0b0862c41ee031f38d 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.models.question import Question, QuestionManager
+from forum.modules.decorators import decorate
 
-def question_search(keywords):
-    return Question.objects.extra(
+@decorate(QuestionManager.search, needs_origin=False)
+def question_search(self, keywords):
+    return self.extra(
+                    tables=['forum_rootnode_doc'],
                     select={
-                        'ranking': "ts_rank_cd(tsv, plainto_tsquery(%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=["tsv @@ plainto_tsquery(%s)"],
+                    where=['"forum_rootnode_doc"."node_id" = "forum_node"."id"', '"forum_rootnode_doc"."document" @@ plainto_tsquery(\'english\', %s)'],
                     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