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

[Brian Lloyd]

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

Modified Files:
	TextIndex.py 
Log Message:
Merged fix for NOP in regex from 2.3 branch



--- Updated File TextIndex.py in package Zope2 --
--- TextIndex.py	2001/03/21 22:08:32	1.27
+++ TextIndex.py	2001/03/27 14:58:20	1.28
@@ -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)