Better search, mixing FTS and exact match and better related questions functionality.

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

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index e1d98f20877875e6ac958a0b0862c41ee031f38d..6e2165b247278613753a05367441e80c846931af 100644 (file)
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -1,15 +1,22 @@
+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):
     return self.extra(
 from forum.models.question import Question, QuestionManager
 from forum.modules.decorators import decorate
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
     return self.extra(

-                    tables=['forum_rootnode_doc'],
+                    tables = ['forum_rootnode_doc'],

                     select={
                     select={

-                        'ranking': 'ts_rank_cd(\'{0.1, 0.2, 0.8, 1.0}\'::float4[], "forum_rootnode_doc"."document", plainto_tsquery(\'english\', %s), 32)',
+                        '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))
+                                """,

                     },
                     },

-                    where=['"forum_rootnode_doc"."node_id" = "forum_node"."id"', '"forum_rootnode_doc"."document" @@ plainto_tsquery(\'english\', %s)'],
+                    where=["""
+                           "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ plainto_tsquery('english', %s) OR
+                           "forum_node"."title" ILIKE '""" + keywords + """%%')
+                           """],

                     params=[keywords],
                     select_params=[keywords],
                     order_by=['-ranking']
                     params=[keywords],
                     select_params=[keywords],
                     order_by=['-ranking']

-                )
\ No newline at end of file
+                )
+