X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..aedb39383100b0ae2613c2f3beee6d397cd560d4:/forum_modules/pgfulltext/handlers.py?ds=sidebyside

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
old mode 100755
new mode 100644
index 17fb176..e1d98f2
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,15 @@
-from forum.models import Question
-
-def question_search(keywords, orderby):
-    return Question.objects.filter(deleted=False).extra(
-                    select={
-                        'ranking': "ts_rank_cd(tsv, plainto_tsquery(%s), 32)",
-                    },
-                    where=["tsv @@ plainto_tsquery(%s)"],
-                    params=[keywords],
-                    select_params=[keywords]
-                ).order_by(orderby, '-ranking')
\ No newline at end of file
+from forum.models.question import Question, QuestionManager
+from forum.modules.decorators import decorate
+
+@decorate(QuestionManager.search, needs_origin=False)
+def question_search(self, keywords):
+    return self.extra(
+                    tables=['forum_rootnode_doc'],
+                    select={
+                        '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],
+                    select_params=[keywords],
+                    order_by=['-ranking']
+                )
\ No newline at end of file