Fixes OSQA 334, Set translation for the word "Thanks," in email footer.

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index fc64bac73216841f37e3e9cf6940bbb918db7f85..196790bfedc964b14fe43cb22c058fb631e96056 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,11 +1,14 @@
+import re

 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
 from forum.modules.decorators import decorate
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
 from forum.modules.decorators import decorate
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):

-    tsquery = " | ".join(keywords.split(' '))
-    
+    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={
     return self.extra(
                     tables = ['forum_rootnode_doc'],
                     select={


@@ -15,9 +18,9 @@ def question_search(self, keywords):
                     },
                     where=["""
                            "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
                     },
                     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],
+                    params=[tsquery, ilike],

                     select_params=[tsquery],
                     order_by=['-ranking']
                 )
                     select_params=[tsquery],
                     order_by=['-ranking']
                 )