when reindexing an object that got a uid, try the object's reindexObj…

…ect attribute first. refs https://bugs.launchpad.net/bugs/290982

Products/CMFUid/CHANGES.txt

@@ -4,6 +4,11 @@ Products.CMFUid Changelog
 2.2.0 (unreleased)
 ------------------
 
+- UniqueIdHandlerTool: Call the reindexObject attribute of the object
+  getting a uid, rather than portal_catalog's reindexObject.  This is
+  needed to properly handle objects like the portal itself which shouldn't
+  get catalogued ever.
+
 - Removed redundant and unexpected code to auto-create catalog index and
   column for the UID handler tool. The index and column are already
   created by the default CMFUid GenericSetup profile.

Products/CMFUid/UniqueIdHandlerTool.py

@@ -87,7 +87,10 @@ def _setUid(self, obj, uid):
         annotation.setUid(uid)
 
         # reindex the object
-        self._reindexObject(obj)
+        try:
+            obj.reindexObject()
+        except AttributeError:
+            self._reindexObject(obj)
 
     security.declarePublic('register')
     def register(self, obj):

Products/CMFUid/tests/test_uidhandling.py

@@ -276,6 +276,18 @@ def test_UidCatalogingDoesNotAcquireUid(self):
         brains = catalog(cmf_uid=uid)
         self.assertEqual(len(brains), 1)
 
+    def test_UidCatalogingDoesNotCatalogPortalRoot(self):
+        handler = self.root.portal_uidhandler
+        catalog = self.root.portal_catalog
+        dummy = self.root.dummy
+
+        # mock the portal root, which has empty indexing attributes
+        dummy.reindexObject = lambda: None
+
+        uid = handler.register(dummy)
+        brains = catalog(cmf_uid=uid)
+        self.assertEqual(len(brains), 0)
+
 
 def test_suite():
     return unittest.TestSuite((