From 13f00004251eb9a3c6f62b5a176179a782319540 Mon Sep 17 00:00:00 2001 From: jordan Date: Thu, 23 Jun 2011 16:05:55 +0000 Subject: [PATCH] be sure to make the filtration of the queryset during search, the old search mechanism didn't exclude results with keywords that were not available git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1069 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum_modules/mysqlfulltext/startup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forum_modules/mysqlfulltext/startup.py b/forum_modules/mysqlfulltext/startup.py index e5d4849..1b12517 100644 --- a/forum_modules/mysqlfulltext/startup.py +++ b/forum_modules/mysqlfulltext/startup.py @@ -43,7 +43,7 @@ word_re = re.compile(r'\w+', re.UNICODE) def question_search(self, keywords): keywords = keywords.upper() - return '-ranking', self.filter( + qs = self.filter( models.Q(ftsindex__body__isnull=False) ).extra( select={ @@ -54,4 +54,5 @@ def question_search(self, keywords): """, }, select_params=[keywords, keywords, keywords] - ) + ).filter(Q(title__search=keywords) | Q(tagnames__search=keywords) | Q(body__search=keywords)) + return '-ranking', qs -- 2.45.1