Add also the portal type on deletion of the index to make sure we hav…

…e all needed info

src/plone.server/plone/server/catalog/catalog.py

@@ -101,9 +101,6 @@ def __call__(self):
                     ident = schema.getName() + '-' + real_field.getName()
                     values[ident] = json_compatible(value)
 
-        # Look for plone.indexer
-        # TODO
-
         # Global Roles
 
         roles = {}

src/plone.server/plone/server/catalog/index.py

@@ -64,7 +64,10 @@ def remove_object(obj, event):
     uid = getattr(obj, 'uuid', None)
     if uid is None:
         return
-    hook.remove.append(uid)
+    portal_type = getattr(obj, 'portal_type', None)
+    if portal_type is None:
+        return
+    hook.remove.append((uid, portal_type))
     if uid in hook.index:
         del hook.index[uid]
 
@@ -76,6 +79,9 @@ def add_object(obj, event):
     uid = getattr(obj, 'uuid', None)
     if uid is None:
         return
+    portal_type = getattr(obj, 'portal_type', None)
+    if portal_type is None:
+        return
     search = queryUtility(ICatalogUtility)
     if search is not None:
         hook.index[uid] = search.get_data(obj)