Merged in changes from branch to make sure that things get unindexed before

they get reindexed.

lib/python/SearchIndex/UnIndex.py

@@ -84,7 +84,9 @@
 ##############################################################################
 
 """Simple column indices"""
-__version__='$Revision: 1.14 $'[11:-2]
+
+__version__='$Revision: 1.15 $'[11:-2]
+
 
 from Globals import Persistent
 from Acquisition import Implicit
@@ -157,6 +159,10 @@ class UnIndex(Persistent, Implicit):
     def index_object(self, i, obj, threshold=None):
         """ index and object 'obj' with integer id 'i'"""
 
+        # Before we do anything, unindex the object we've been handed, as
+        # we can't depend on the user to do the right thing.
+        self.unindex_object(i)
+        
         index = self._index
         unindex = self._unindex
 

lib/python/SearchIndex/UnKeywordIndex.py

@@ -16,6 +16,10 @@ class UnKeywordIndex(UnIndex):
     def index_object(self, i, obj, threshold=None):
         """ index an object 'obj' with integer id 'i'"""
 
+        # Before we do anything, unindex the object we've been handed, as
+        # we can't depend on the user to do the right thing.
+        self.unindex_object(i)
+
         index = self._index
         unindex = self._unindex
 
@@ -51,8 +55,7 @@ class UnKeywordIndex(UnIndex):
 
         kws = unindex.get(i, None)
         if kws is None:
-            LOG('UnKeywordIndex', ERROR,('unindex_object was called with bad '
-                                         'integer id %s' % str(i)))
+            return None
         for kw in kws:
             set = index.get(kw, None)
             if set is not None:

lib/python/SearchIndex/UnTextIndex.py

@@ -92,7 +92,8 @@ is no longer known.
 
 
 """
-__version__='$Revision: 1.28 $'[11:-2]
+__version__='$Revision: 1.29 $'[11:-2]
+
 
 from Globals import Persistent
 import BTree, IIBTree, IOBTree, OIBTree
@@ -226,7 +227,10 @@ class UnTextIndex(Persistent, Implicit):
 
           the next four arguments are default optimizations.
           """
-
+        # Before we do anything, unindex the object we've been handed, as
+        # we can't depend on the user to do the right thing.
+        self.unindex_object(i)
+        
         id = self.id
         try:
             ## sniff the object for our 'id', the 'document source' of