[Zope-Checkins] CVS: Zope2 - TextIndex.py:1.25.116.3

Brian Lloyd brian@digicool.com
Tue, 27 Mar 2001 09:56:36 -0500 (EST)


Update of /cvs-repository/Zope2/lib/python/SearchIndex
In directory korak:/home/brian/temp/zope-23-branch/lib/python/SearchIndex

Modified Files:
      Tag: zope-2_3-branch
	TextIndex.py 
Log Message:
Fix bug 2081: NOP in regex



--- Updated File TextIndex.py in package Zope2 --
--- TextIndex.py	2001/03/21 20:20:46	1.25.116.2
+++ TextIndex.py	2001/03/27 14:56:36	1.25.116.3
@@ -463,7 +463,7 @@
 def query(s, index, default_operator = Or,
           ws = (string.whitespace,)):
     # First replace any occurences of " and not " with " andnot "
-    s = ts_regex.gsub('[%s]+and[%s]*not[%s]+' % (ws * 3), ' andnot ', s)
+    s = ts_regex.gsub('[%s]+and[%s]+not[%s]+' % (ws * 3), ' andnot ', s)
     q = parse(s)
     q = parse2(q, default_operator)
     return evaluate(q, index)