X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f8bdcf43ec75e04c30cb26e6c35e1a9f3cf262be..50218f3c76fc43de83da77dda0501b5aabffa4d4:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 4cac36f..c8b4e09 100644
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,26 @@
-from forum.models import Question
+import re
+from django.db.models import Q
+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):
+    repl_re = re.compile(r'[^\'-_\s\w]')
+    tsquery = " | ".join([k for k in repl_re.sub('', keywords).split(' ') if k])
+
+    return self.extra(
+                    tables = ['forum_rootnode_doc'],
                     select={
-                        'ranking': "node_ranking(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(id, %s) > 0"],
-                    params=[keywords],
-                    select_params=[keywords]
-                ).order_by('-ranking')
\ No newline at end of file
+                    where=["""
+                           "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
+                           "forum_node"."title" ILIKE '""" + keywords.replace("'",r"\'") + """%%')
+                           """],
+                    params=[tsquery],
+                    select_params=[tsquery],
+                    order_by=['-ranking']
+                )
+