- added 'indexSize' to IPluggableIndex

src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py

@@ -299,18 +299,6 @@ class DateRangeIndex(UnIndex):
 
         return result, ( self._since_field, self._until_field )
 
-    #
-    #   ZCatalog needs this, although it isn't (yet) part of the interface.
-    #
-    security.declareProtected(view , 'numObjects')
-    def numObjects( self ):
-        """ """
-        return len( self._unindex )
-
-    def indexSize(self):
-        """ """
-        return len(self)
-
     #
     #   Helper functions.
     #

src/Products/PluginIndexes/PathIndex/PathIndex.py

@@ -193,11 +193,11 @@ class PathIndex(Persistent, SimpleItem):
         return results
 
     def numObjects(self):
-        """ return the number distinct values """
+        """Return the number of indexed objects."""
         return len(self._unindex)
 
     def indexSize(self):
-        """ return the number of indexed objects"""
+        """Return the size of the index in terms of distinct values."""
         return len(self)
 
     def __len__(self):

src/Products/PluginIndexes/TopicIndex/TopicIndex.py

@@ -85,6 +85,11 @@ class TopicIndex(Persistent, SimpleItem):
         return 1
 
     def numObjects(self):
+        """Return the number of indexed objects."""
+        return "n/a"
+
+    def indexSize(self):
+        """Return the size of the index in terms of distinct values."""
         return "n/a"
 
     def search(self,filter_id):

src/Products/PluginIndexes/common/UnIndex.py

@@ -277,11 +277,11 @@ class UnIndex(SimpleItem):
         return datum
 
     def numObjects(self):
-        """ return number of indexed objects """
+        """Return the number of indexed objects."""
         return len(self._unindex)
 
     def indexSize(self):
-        """ return of distinct values indexed"""
+        """Return the size of the index in terms of distinct values."""
         return len(self)
 
     def unindex_object(self, documentId):

src/Products/PluginIndexes/interfaces.py

@@ -68,11 +68,10 @@ class IPluggableIndex(Interface):
         """
 
     def numObjects():
-        """Return the number of indexed objects"""
+        """Return the number of indexed objects."""
 
-# XXX: not implemented by TextIndex and TopicIndex
-#    def indexSize():
-#        """Return the size of the index in terms of distinct values"""
+    def indexSize():
+        """Return the size of the index in terms of distinct values."""
 
     def clear():
         """Empty the index"""