Fix performance regression caused by [30213] (when creating objects)

In objectValues, doing nothing is a BTree is not initialized speeds up
_setObject by about ~1 %. But a third code path must be added for OFS Folders
(here, ERP5 Category Tool).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30252 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Tool/CategoryTool.py

@@ -36,6 +36,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Products.ERP5Type.Globals import InitializeClass
 from Products.ERP5Type import Permissions
+from Products.ERP5Type.Core.Folder import OFS_HANDLER
 from Products.ERP5Type.CopySupport import CopyContainer
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.Cache import caching_instance_method
@@ -52,6 +53,7 @@ class CategoryTool(CopyContainer, CMFCategoryTool, BaseTool):
     meta_type       = 'ERP5 Categories'
     portal_type     = 'Category Tool'
     allowed_types   = ( 'ERP5 Base Category',)
+    _folder_handler = OFS_HANDLER
 
     # Declarative Security
     security = ClassSecurityInfo()

product/ERP5Type/Core/Folder.py

@@ -367,6 +367,8 @@ class FolderMixIn(ExtensionClass.Base):
     else:
       return None
 
+
+OFS_HANDLER = 0
 BTREE_HANDLER = 1
 HBTREE_HANDLER = 2
 
@@ -1386,38 +1388,31 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn,
                    **kw):
     # Returns list of objects contained in this folder.
     #  (no docstring to prevent publishing)
-
     if meta_type is not None:
       spec = meta_type
-    # when an object inherits from Folder after it was instanciated, it lacks
-    # its BTreeFolder properties.
-#     if getattr(self, '_tree', None) is None:
-#       try:
-#         self._initBTrees()
-#       except AttributeError:
-#         from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
-#         BTreeFolder2Base.__init__(self, self.getId())
-
-    if self._folder_handler == HBTREE_HANDLER:
+    if self._folder_handler == BTREE_HANDLER:
+      if self._tree is None:
+        return []
+      object_list = CMFBTreeFolder.objectValues(self, spec=spec)
+    elif self._folder_handler == HBTREE_HANDLER:
       if self._htree is None:
-        object_list = []
-      else:
-        if kw.has_key("base_id"):
+        return []
+      if 'base_id' in kw:
         object_list = CMFHBTreeFolder.objectValues(self, base_id=kw['base_id'])
       else:
         object_list = CMFHBTreeFolder.objectValues(self)
     else:
-      object_list = CMFBTreeFolder.objectValues(self, spec=spec)
+      object_list = map(self._getOb, self.objectIds(spec))
     if portal_type is not None:
-      if type(portal_type) == type(''):
+      if isinstance(portal_type, str):
         portal_type = (portal_type,)
       object_list = filter(lambda x: x.getPortalType() in portal_type,
                            object_list)
     if checked_permission is not None:
       checkPermission = getSecurityManager().checkPermission
-      object_list = [o for o in object_list if checkPermission(checked_permission, o)]
-    object_list = sortValueList(object_list, sort_on, sort_order, **kw)
-    return object_list
+      object_list = [o for o in object_list
+                       if checkPermission(checked_permission, o)]
+    return sortValueList(object_list, sort_on, sort_order, **kw)
 
   security.declareProtected( Permissions.AccessContentsInformation,
                              'contentValues' )