Some improvements in the mysql full text module.

[osqa.git] / forum_modules / mysqlfulltext / startup.py

diff --git a/forum_modules/mysqlfulltext/startup.py b/forum_modules/mysqlfulltext/startup.py
index e2bc7efc91a6f36c34097a3036353b3c5f00cf9a..232bbb46a633d517ed563ca6680554a9aef40d95 100644 (file)
--- a/forum_modules/mysqlfulltext/startup.py
+++ b/forum_modules/mysqlfulltext/startup.py
@@ -44,14 +44,13 @@ def question_search(self, keywords):
     keywords = keywords.upper()
 
     return '-ranking', self.filter(
-            models.Q(ftsindex__body__search=keywords) or models.Q(ftsindex__title__search=keywords) or models.Q(ftsindex__tagnames__search=keywords)
-
+            models.Q(ftsindex__body__isnull=False)
     ).extra(
         select={
             'ranking': """
-                match(forum_mysqlftsindex.tagnames) against (%s in boolean mode) * 4 +
-                match(forum_mysqlftsindex.title) against (%s in boolean mode) * 2 +
-                match(forum_mysqlftsindex.body) against (%s in boolean mode) * 1
+                match(forum_mysqlftsindex.tagnames) against (%s) * 2 +
+                match(forum_mysqlftsindex.title) against (%s) * 4 +
+                match(forum_mysqlftsindex.body) against (%s) * 1
                                 """,
             },
         select_params=[keywords, keywords, keywords]