ERP5Type.Core.Predicate: optimise test().

product/ERP5Type/Core/Predicate.py

@@ -139,6 +139,11 @@ class Predicate(XMLObject):
 #            (result, property, value, max))
         if not result:
           return result
+    # Test category memberships. Enable the read-only transaction cache
+    # because this part is strictly read-only, and context.isMemberOf
+    # is very expensive when the category list has many items.
+    membership_criterion_category_list = self.getMembershipCriterionCategoryList()
+    if membership_criterion_category_list:
       multimembership_criterion_base_category_list = \
         self.getMultimembershipCriterionBaseCategoryList()
       membership_criterion_base_category_list = \
@@ -149,13 +154,10 @@ class Predicate(XMLObject):
 #         (multimembership_criterion_base_category_list,
 #         membership_criterion_base_category_list,
 #         self.getMembershipCriterionCategoryList()))
-    # Test category memberships. Enable the read-only transaction cache
-    # because this part is strictly read-only, and context.isMemberOf
-    # is very expensive when the category list has many items.
       if isMemberOf is None:
         isMemberOf = context._getCategoryTool().isMemberOf
       with readOnlyTransactionCache():
-      for c in self.getMembershipCriterionCategoryList():
+        for c in membership_criterion_category_list:
           bc = c.split('/', 1)[0]
           if tested_base_category_list is None or bc in tested_base_category_list:
             if bc in multimembership_criterion_base_category_list: