fixes problem with always showing alert dialog in chrome. Still working out non...

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index fc64bac73216841f37e3e9cf6940bbb918db7f85..04d3a67b8a20a40b3a7ec10d8f2c01bd25f2a1ee 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,24 +1,30 @@
+import re

 from django.db.models import Q
 from forum.models.question import Question, QuestionManager
 from django.db.models import Q
 from forum.models.question import Question, QuestionManager

-from forum.modules.decorators import decorate
+from forum.modules import decorate
+
+word_re = re.compile(r'\w+', re.UNICODE)

 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):

-    tsquery = " | ".join(keywords.split(' '))
-    
-    return self.extra(
-                    tables = ['forum_rootnode_doc'],
-                    select={
-                        'ranking': """
+    tsquery = " | ".join(word_re.findall(keywords))
+    ilike = keywords + u"%%"
+
+    return True, 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))
                                 """,
                                 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],
+            )
+
+
+