X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/556b606eee95245369a29dcd870b89e0d44686d8..9b6be99a1eed1adddfd062642f6ca23f79d14aea:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index fc64bac..6952758 100644
--- 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 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(keywords.split(' '))
-    
+    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': """
+            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=["""
+            },
+            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"\'") + """%%')
+                           "forum_node"."title" ILIKE %s)
                            """],
-                    params=[tsquery],
-                    select_params=[tsquery],
-                    order_by=['-ranking']
-                )
+            params=[tsquery, ilike],
+            select_params=[tsquery],
+            order_by=['-ranking']
+            )