X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..485b15b2138e19fc32b0d48a654c56d18b1f0af6:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
old mode 100755
new mode 100644
index 17fb176..835c2f5
--- 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 import Question
+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(
+                    select={
+                        'ranking': 'node_ranking("forum_node"."id", %s)',
+                    },
+                    where=['node_ranking("forum_node"."id", %s) > 0'],
+                    params=[keywords],
+                    select_params=[keywords],
+                    order_by=['-ranking']
+                )
\ No newline at end of file