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

[Gary Poster]

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

Modified Files:
	TopicIndex.py 
Log Message:
I zigged when I should have zagged in my last checkins.  The IITreeSet should remain unadulterated in the TopicIndex results, and the tests should adjust.




=== Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 1.16 => 1.17 ===
--- Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py:1.16	Wed Dec 31 16:18:03 2003
+++ Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py	Wed Dec 31 17:32:21 2003
@@ -17,7 +17,7 @@
 from OFS.SimpleItem import SimpleItem
 from zLOG import ERROR, LOG
 from BTrees.OOBTree import OOBTree
-from BTrees.IIBTree import IISet,intersection,union
+from BTrees.IIBTree import IITreeSet,intersection,union
 
 import FilteredSet
 from Products.PluginIndexes import PluggableIndex
@@ -100,9 +100,9 @@
             res = set_func(res,rows)
 
         if res:
-            return res.keys(), (self.id,)
+            return res, (self.id,)
         else:
-            return IISet(), (self.id,)
+            return IITreeSet(), (self.id,)
 
     def uniqueValues(self,name=None, withLength=0):
         """ needed to be consistent with the interface """