From 657df52ea38db5c5a3c2665f452da81d6e4ac608 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 22 Oct 2003 15:15:50 +0000 Subject: [PATCH] Fixed search to put the word between stars if it doesn't have any globbing metachacters. --- plugins/Factoids.py | 2 ++ test/test_Factoids.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/Factoids.py b/plugins/Factoids.py index a374388fd..1a32eb0fd 100644 --- a/plugins/Factoids.py +++ b/plugins/Factoids.py @@ -384,6 +384,8 @@ class Factoids(plugins.ChannelDBHandler, callbacks.Privmsg): db.create_function(predicateName, 1, p) predicateName += 'p' for glob in rest: + if '*' not in glob and '?' not in glob: + glob = '*%s*' % glob criteria.append('key LIKE %s') formats.append(glob.translate(self._sqlTrans)) cursor = db.cursor() diff --git a/test/test_Factoids.py b/test/test_Factoids.py index 3ead12023..bbe38cf55 100644 --- a/test/test_Factoids.py +++ b/test/test_Factoids.py @@ -93,6 +93,8 @@ if sqlite is not None: 'inkedmn.*strike|strike.*inkedmn') self.assertRegexp('search *ke*', 'inkedmn.*strike|strike.*inkedmn') + self.assertRegexp('search ke', + 'inkedmn.*strike|strike.*inkedmn') def testNotZeroIndexed(self):