X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/eb5d07faf2fe743f482ba8b3168e083e4df29434..be26ac9493b40e87e07c773a8d7c79ef1e8b7b48:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index 6e2165b..fc64bac 100644
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -4,19 +4,21 @@ from forum.modules.decorators import decorate
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
+    tsquery = " | ".join(keywords.split(' '))
+    
     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", plainto_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=["""
-                           "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ plainto_tsquery('english', %s) OR
-                           "forum_node"."title" ILIKE '""" + keywords + """%%')
+                           "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"\'") + """%%')
                            """],
-                    params=[keywords],
-                    select_params=[keywords],
+                    params=[tsquery],
+                    select_params=[tsquery],
                     order_by=['-ranking']
                 )