Cache instanciation of predicates

Resource.asPredicate was broken and Base.asPredicate is useless.

product/ERP5/Document/Resource.py

@@ -630,20 +630,6 @@ class Resource(XMLObject, XMLMatrix, VariatedMixin):
       # Default value is None
       return None
 
-    # Predicate handling
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'asPredicate')
-    def asPredicate(self):
-      """
-      Returns a temporary Predicate based on the Resource properties
-      """
-      from Products.ERP5 import newTempPredicateGroup as newTempPredicate
-      p = newTempPredicate(self.getId(), uid = self.getUid())
-      p.setMembershipCriterionBaseCategoryList(('resource',))
-      p.setMembershipCriterionCategoryList(('resource/%s'
-          % self.getRelativeUrl(),))
-      return p
-
     def _pricingSortMethod(self, a, b):
       # Simple method : the one that defines a destination section wins
       if a.getDestinationSection():

product/ERP5Type/Base.py

@@ -2957,18 +2957,6 @@ class Base( CopyContainer,
           return object.__of__(self)
     raise AttributeError(id)
 
-  # Predicate handling
-  security.declareProtected(Permissions.AccessContentsInformation, 'asPredicate')
-  def asPredicate(self, script_id=None):
-    """
-      This method tries to convert the current Document into a predicate
-      looking up methods named Class_asPredictae, MetaType_asPredicate, PortalType_asPredicate
-    """
-    script = self._getTypeBasedMethod('asPredicate', script_id=script_id)
-    if script is not None:
-      return script()
-    return None
-
   def _getAcquireLocalRoles(self):
     """This method returns the value of acquire_local_roles of the object's
     portal_type.

product/ERP5Type/Core/Predicate.py

@@ -41,6 +41,7 @@ from Products.ERP5Type.Document import newTempBase
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.Utils import convertToUpperCase
 from Products.ERP5Type.Cache import readOnlyTransactionCache
+from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ZSQLCatalog.SQLCatalog import SQLQuery
 from Products.ERP5Type.Globals import PersistentMapping
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
@@ -579,21 +580,25 @@ class Predicate(XMLObject):
 
     return new_self
 
-  # Predicate handling
   security.declareProtected(Permissions.AccessContentsInformation,
                             'asPredicate')
   def asPredicate(self, script_id=None):
     """
       This method tries to convert the current Document into a predicate
-      looking up methods named ${PortalType}_asPredicate,
-      ${MetaType}_asPredicate, ${Class}_asPredicate     
-    """
-    if script_id is not None:
-      script = getattr(self, script_id, None)
+      looking up methods named Class_asPredictae, MetaType_asPredicate, PortalType_asPredicate
+    """
+    cache = getTransactionalVariable()
+    key = id(self), script_id
+    if 'asPredicate' in cache:
+      cache = cache['asPredicate']
+      if key in cache:
+        return cache[key]
     else:
-      script = self._getTypeBasedMethod('asPredicate')
+      cache = cache['asPredicate'] = {}
+    script = self._getTypeBasedMethod('asPredicate', script_id)
     if script is not None:
-      return script()
+      self = script()
+    cache[key] = self
     return self
 
   def searchPredicate(self, **kw):