[Zope-Checkins] CVS: Zope2 - UnTextIndex.py:1.46
chrism@serenade.digicool.com
chrism@serenade.digicool.com
Tue, 27 Mar 2001 18:50:31 -0500
Update of /cvs-repository/Zope2/lib/python/SearchIndex
In directory serenade.digicool.com:/home/chrism/sandboxes/TrunkBranch/lib/python/SearchIndex
Modified Files:
UnTextIndex.py
Log Message:
Merge into trunk for collector 2098.
--- Updated File UnTextIndex.py in package Zope2 --
--- UnTextIndex.py 2001/03/22 18:33:05 1.45
+++ UnTextIndex.py 2001/03/27 23:50:31 1.46
@@ -93,6 +93,7 @@
__version__ = '$Revision$'[11:-2]
+
import string, regex, regsub, ts_regex
import operator
@@ -577,7 +578,6 @@
def get_operands(self, q, i):
"""Evaluate and return the left and right operands for an operator"""
-
try:
left = q[i - 1]
right = q[i + 1]
@@ -611,7 +611,7 @@
# to evaluate, and we just get the results and return them.
if (len(query) == 1):
if (type(query[0]) is ListType):
- return evaluate(query[0], self)
+ return self.evaluate(query[0])
return self[query[0]] # __getitem__