[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/DateIndex - DateIndex.py:1.1.2.3

Martijn Pieters mj@zope.com
Fri, 10 May 2002 18:30:43 -0400


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

Modified Files:
      Tag: mj-dateindexes_integration-branch
	DateIndex.py 
Log Message:
Checkpoint. Potential bugfix, remove duplicate override in index class, extend
tests. There is a bug triggered by the tests I have to squash.


=== Zope/lib/python/Products/PluginIndexes/DateIndex/DateIndex.py 1.1.2.2 => 1.1.2.3 ===
 from BTrees.IOBTree import IOBTree
 from BTrees.OIBTree import OIBTree
-from BTrees.IIBTree import IISet, union
+from BTrees.IIBTree import IISet, union, intersection
 
 _marker = []
 
@@ -63,7 +63,7 @@
 
         if ConvertedDate != oldConvertedDate:
             if oldConvertedDate is not _marker:
-                self.removeForwardIndexEntry( oldConvertedDate, documentId )
+                self.removeForwardIndexEntry(oldConvertedDate, documentId)
 
             if ConvertedDate is not _marker:
                 self.insertForwardIndexEntry( ConvertedDate, documentId )
@@ -136,11 +136,6 @@
             return IISet(), (self.id,)
         else:
             return r, (self.id,)
-
-
-    def numObjects( self ):
-        """ How many objects are in the index? """
-        return len( self._unindex )
 
 
     def _convert( self, value, default=None ):