[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TopicIndex - TopicIndex.py:1.1.2.8

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TopicIndex
In directory cvs.zope.org:/tmp/cvs-serv21484

Modified Files:
      Tag: ajung-topicindex
	TopicIndex.py 
Log Message:
- code cleanup
- changed catalog tests


=== Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 1.1.2.7 => 1.1.2.8 ===
 
     def __init__(self,id,caller=None):
-        self.id = id
-        self.filteredSets = OOBTree()
+        self.id             = id
+        self.filteredSets   = OOBTree()
         self.uncatalogedIds = OOSet()
 
         # experimental code for specifing the operator
-        self.operators = ['or','and'] 
-        self.useOperator = 'or'
+        self.operators       = ['or','and'] 
+        self.defaultOperator = 'or'
 
 
     def clear(self):
@@ -190,7 +190,7 @@
         if record.keys==None: return None
 
         # experimental code for specifing the operator
-        operator = record.get('operator',self.useOperator).lower()
+        operator = record.get('operator',self.defaultOperator).lower()
 
         # depending on the operator we use intersection of union
         if operator=="or":  set_func = union