More two mappings to SX properties.

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index e46c5719ba8a3cf4fddd92971e660ece1ee1d2fe..18a23e3d2c88b75721eb7b3e0b3c6ddb72eaa076 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,24 +1,29 @@
+import re

 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
 from forum.modules.decorators import decorate
 
 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
 from forum.modules.decorators 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):
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):

-    tsquery = " | ".join([k for k in keywords.split(' ') if k])
-    
+    tsquery = " | ".join([k for k in repl_re.sub('', sing_quote_re.sub("'", keywords.strip())).split(' ') if k])
+    ilike = keywords + u"%%"
+

     return self.extra(
     return self.extra(

-                    tables = ['forum_rootnode_doc'],
-                    select={
-                        'ranking': """
+            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))
                                 """,
                                 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=["""
+            },
+            where=["""

                            "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
                            "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"\'") + """%%')
+                           "forum_node"."title" ILIKE %s)

                            """],
                            """],

-                    params=[tsquery],
-                    select_params=[tsquery],
-                    order_by=['-ranking']
-                )
+            params=[tsquery, ilike],
+            select_params=[tsquery],
+            order_by=['-ranking']
+            )