Merged c106786 from 2.12 branch

src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py

@@ -316,27 +316,42 @@ class DateRangeIndex(UnIndex):
 
             set = self._until_only.get( until, None )
             if set is None:
-                set = self._until_only[ until ] = IISet()  # XXX: Store an int?
-            set.insert( documentId )
-
+                self._until_only[ until ] = documentId
+            else:
+                if isinstance(set, int):
+                    set = self._until_only[ until ] = IISet((set, documentId))
+                else:
+                    set.insert( documentId )
         elif until is None:
 
             set = self._since_only.get( since, None )
             if set is None:
-                set = self._since_only[ since ] = IISet()  # XXX: Store an int?
-            set.insert( documentId )
+                self._since_only[ since ] = documentId
+            else:
+                if isinstance(set, int):
+                    set = self._since_only[ since ] = IISet((set, documentId))
+                else:
+                    set.insert( documentId )
 
         else:
 
             set = self._since.get( since, None )
             if set is None:
-                set = self._since[ since ] = IISet()   # XXX: Store an int?
-            set.insert( documentId )
+                self._since[ since ] = documentId
+            else:
+                if isinstance(set, int):
+                    set = self._since[ since ] = IISet((set, documentId))
+                else:
+                    set.insert( documentId )
 
             set = self._until.get( until, None )
             if set is None:
-                set = self._until[ until ] = IISet() # XXX: Store an int?
-            set.insert( documentId )
+                self._until[ until ] = documentId
+            else:
+                if isinstance(set, int):
+                    set = self._until[ until ] = IISet((set, documentId))
+                else:
+                    set.insert( documentId )
 
     def _removeForwardIndexEntry( self, since, until, documentId ):
         """
@@ -352,36 +367,50 @@ class DateRangeIndex(UnIndex):
             set = self._until_only.get( until, None )
             if set is not None:
 
-                set.remove( documentId )
+                if isinstance(set, int):
+                    del self._until_only[until]
+                else:
+                    set.remove( documentId )
 
-                if not set:
-                    del self._until_only[ until ]
+                    if not set:
+                        del self._until_only[ until ]
 
         elif until is None:
 
             set = self._since_only.get( since, None )
             if set is not None:
 
-                set.remove( documentId )
-
-                if not set:
+                if isinstance(set, int):
                     del self._since_only[ since ]
+                else:
+                    set.remove( documentId )
+
+                    if not set:
+                        del self._since_only[ since ]
 
         else:
 
             set = self._since.get( since, None )
             if set is not None:
-                set.remove( documentId )
 
-                if not set:
+                if isinstance(set, int):
                     del self._since[ since ]
+                else:
+                    set.remove( documentId )
+
+                    if not set:
+                        del self._since[ since ]
 
             set = self._until.get( until, None )
             if set is not None:
-                set.remove( documentId )
 
-                if not set:
+                if isinstance(set, int):
                     del self._until[ until ]
+                else:
+                    set.remove( documentId )
+
+                    if not set:
+                        del self._until[ until ]
 
     def _convertDateTime( self, value ):
         if value is None: