merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -69,6 +69,7 @@ Fixed:
 - fix some security assertions (sf bug 1085481)
 - don't set the title to nothing from incoming mail (thanks Bruce Guenter)
 - fix py2.4 strftime() API change bug (sf bug 1087746)
+- fix indexer searching with no valid words (sf bug 1086787)
 
 
 2004-10-26 0.7.9

roundup/backends/indexer_rdbms.py

@@ -74,6 +74,9 @@ def find(self, wordlist):
         If none are found return an empty dictionary
         * more rules here
         '''        
+        if not wordlist:
+            return {}
+
         l = [word.upper() for word in wordlist if 26 > len(word) > 2]
 
         a = ','.join([self.db.arg] * len(l))

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.55 2004-11-26 00:01:04 richard Exp $
+# $Id: db_test_base.py,v 1.55.2.1 2005-01-03 03:23:38 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -698,6 +698,7 @@ def testIndexerSearching(self):
         i1 = self.db.issue.create(files=[f1, f2], title="flebble plop")
         i2 = self.db.issue.create(title="flebble the frooz")
         self.db.commit()
+        self.assertEquals(self.db.indexer.search([], self.db.issue), {})
         self.assertEquals(self.db.indexer.search(['hello'], self.db.issue),
             {i1: {'files': [f1]}})
         self.assertEquals(self.db.indexer.search(['world'], self.db.issue), {})