X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/2591b1770a0d108069a8b1ffee485ae02f796263..b320ae1fdd45574568c13da6ebd12cefb52e63c4:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 2b57e96..ff29f14 100644
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,16 +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.views.readers import do_question_search
 
-@decorate(do_question_search, needs_origin=False)
-def question_search(keywords):
-    return Question.objects.all().extra(
-                    tables=['forum_rootnode_doc'],
+@decorate(QuestionManager.search, needs_origin=False)
+def question_search(self, keywords):
+    tsquery = " | ".join(keywords.split(' '))
+    
+    return self.extra(
+                    tables = ['forum_rootnode_doc'],
                     select={
-                        'ranking': 'ts_rank_cd("forum_rootnode_doc"."document", plainto_tsquery(\'english\', %s), 32)',
+                        '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=['"forum_rootnode_doc"."node_id" = "forum_node"."id"', '"forum_rootnode_doc"."document" @@ plainto_tsquery(\'english\', %s)'],
-                    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']
-                )
\ No newline at end of file
+                )
+