[Zope-Checkins] CVS: Zope2 - UnTextIndex.py:1.33.2.13

Chris McDonough chrism@digicool.com
Thu, 22 Mar 2001 13:24:31 -0500 (EST)


Update of /cvs-repository/Zope2/lib/python/SearchIndex
In directory korak:/home/chrism/sandboxes/2_3Branch/lib/python/SearchIndex

Modified Files:
      Tag: zope-2_3-branch
	UnTextIndex.py 
Log Message:
Fix query with parens.



--- Updated File UnTextIndex.py in package Zope2 --
--- UnTextIndex.py	2001/03/22 06:59:10	1.33.2.12
+++ UnTextIndex.py	2001/03/22 18:24:30	1.33.2.13
@@ -578,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]
@@ -591,7 +590,7 @@
         elif operandType is StringType:
             left = self[left]        
         elif operandType is ListType:
-            left = evaluate(left, self)
+            left = self.evaluate(left)
 
         operandType = type(right)
         if operandType is IntType:
@@ -599,7 +598,7 @@
         elif operandType is StringType:
             right = self[right]       
         elif operandType is ListType:
-            right = evaluate(right, self)
+            right = self.evaluate(right)
 
         return (left, right)