Several improvements in the sx importer.

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 2b57e96efe699bca3b6f45a81dfb5b44c1ab7541..18a23e3d2c88b75721eb7b3e0b3c6ddb72eaa076 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,16 +1,29 @@
-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
 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(
-                    tables=['forum_rootnode_doc'],
-                    select={
-                        'ranking': 'ts_rank_cd("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
+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']
+            )
+