[CMF-checkins] CVS: CMF/CMFCore - CatalogTool.py:1.30.4.1

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv2287

Modified Files:
      Tag: CMF-1_3-branch
	CatalogTool.py 
Log Message:
Merged changes from HEAD.

Modified CatalogTool.reindexObject to filter out invalid indexes.


=== CMF/CMFCore/CatalogTool.py 1.30 => 1.30.4.1 ===
         ## Zope 2.3 ZCatalog is supposed to work better if
         ## you don't uncatalog_object() when reindexing.
         # self.uncatalog_object(url)
+        if idxs != []:
+            # Filter out invalid indexes.
+            valid_indexes = self._catalog.indexes.keys()
+            idxs = [i for i in idxs if i in valid_indexes
         self.catalog_object(object, url, idxs=idxs)
 
 InitializeClass(CatalogTool)