two misspeled node states

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 835c2f5dd76e463fc25fed9e5ddfc25ad61f2ab5..ff29f14823f7b8ac2db06aa7dba4bdda84c135c9 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,15 +1,24 @@
-from forum.models import Question
+from django.db.models import Q
+from forum.models.question import Question, QuestionManager

 from forum.modules.decorators import decorate
 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):
+    tsquery = " | ".join(keywords.split(' '))
+    
+    return self.extra(
+                    tables = ['forum_rootnode_doc'],

                     select={
                     select={

-                        'ranking': 'node_ranking("forum_node"."id", %s)',
+                        'ranking': """
+                                rank_exact_matches(ts_rank_cd('{0.1, 0.2, 0.8, 1.0}'::float4[], "forum_rootnode_doc"."document", to_tsquery('english', %s), 32))
+                                """,

                     },
                     },

-                    where=['node_ranking("forum_node"."id", %s) > 0'],
-                    params=[keywords],
-                    select_params=[keywords],
+                    where=["""
+                           "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
+                           "forum_node"."title" ILIKE '""" + keywords + """%%')
+                           """],
+                    params=[tsquery],
+                    select_params=[tsquery],

                     order_by=['-ranking']
                     order_by=['-ranking']

-                )
\ No newline at end of file
+                )
+