X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..9f2913c2565411c1bb8de79a9e7d17e441c9b409:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 45ab2e7..196790b 100644
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,27 @@
-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]", re.UNICODE)
+    tsquery = " | ".join([k for k in repl_re.sub('', keywords).split(' ') if k])
+    ilike = keywords + u"%%"
+
+    return self.extra(
+                    tables = ['forum_rootnode_doc'],
                     select={
-                        'ranking': "ts_rank_cd(tsv, plainto_tsquery(%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=["tsv @@ plainto_tsquery(%s)"],
-                    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 %s)
+                           """],
+                    params=[tsquery, ilike],
+                    select_params=[tsquery],
+                    order_by=['-ranking']
+                )
+