Removes the necessity of the "decoratable" decorator in modules and makes the api...

[osqa.git] / forum_modules / pgfulltext / handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 4cac36f9ae2d6b42bba4a79961653e253f6995d5..69527580c18f59e5232bab1553001b3124cdf6ee 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,29 @@
-from forum.models import Question
-
-def question_search(keywords):
-    return Question.objects.extra(
-                    select={
-                        'ranking': "node_ranking(id, %s)",
-                    },
-                    where=["node_ranking(id, %s) > 0"],
-                    params=[keywords],
-                    select_params=[keywords]
-                ).order_by('-ranking')
\ No newline at end of file
+import re
+from django.db.models import Q
+from forum.models.question import Question, QuestionManager
+from forum.modules import decorate
+
+repl_re = re.compile(r"^'|[^\'\-_\s\w]|'$", re.UNICODE)
+sing_quote_re = re.compile(r"\'+")
+
+@decorate(QuestionManager.search, needs_origin=False)
+def question_search(self, keywords):
+    tsquery = " | ".join([k for k in repl_re.sub('', sing_quote_re.sub("'", keywords.strip())).split(' ') if k])
+    ilike = keywords + u"%%"
+
+    return self.extra(
+            tables = ['forum_rootnode_doc'],
+            select={
+            '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" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
+                           "forum_node"."title" ILIKE %s)
+                           """],
+            params=[tsquery, ilike],
+            select_params=[tsquery],
+            order_by=['-ranking']
+            )
+