*** empty log message ***

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

product/CMFCategory/CategoryTool.py

@@ -754,30 +754,30 @@ class CategoryTool( UniqueObject, Folder, Base ):
         spec = [spec]
       
       if acquired_object_dict is None:
-        acquired_object_dict = {} 
-      
-      context_base_key = (tuple(context.getPhysicalPath()), base_category)
-      if context_base_key in acquired_object_dict:
-        type_dict = acquired_object_dict[context_base_key]
-        if spec is ():
-          if () in type_dict:
-            return []
-          else:
-            type_dict[()] = 1
-        else:            
-          for pt in spec:
-            if pt in type_dict:
+        acquired_object_dict = {} # Initial call may include filter, etc. - do not keep
+      else:
+        context_base_key = (tuple(context.getPhysicalPath()), base_category)
+        if context_base_key in acquired_object_dict:
+          type_dict = acquired_object_dict[context_base_key]
+          if spec is ():
+            if () in type_dict:
               return []
             else:
+              type_dict[()] = 1
+          else:            
+            for pt in spec:
+              if pt in type_dict:
+                return []
+              else:
+                type_dict[pt] = 1
+        else:          
+          type_dict = {}
+          if spec is ():
+            type_dict[()] = 1
+          else:
+            for pt in spec:
               type_dict[pt] = 1
-      else:          
-        type_dict = {}
-        if spec is ():
-          type_dict[()] = 1
-        else:
-          for pt in spec:
-            type_dict[pt] = 1
-        acquired_object_dict[context_base_key] = type_dict
+          acquired_object_dict[context_base_key] = type_dict
                                 
       result = self.getSingleCategoryMembershipList( context, base_category, base=base,
                             spec=spec, filter=filter, **kw )
@@ -833,8 +833,8 @@ class CategoryTool( UniqueObject, Folder, Base ):
               #else:
               #  my_acquisition_object_list = []
           else:
-            #LOG('getAcquiredCategoryMembershipList', 0, 'my_acquisition_object = %s, acquired_object_dict = %s' % (str(context), str(acquired_object_dict)))
-            my_acquisition_list = self.getAcquiredCategoryMembershipList(context,
+            LOG('getAcquiredCategoryMembershipList', 0, 'my_acquisition_object = %s, acquired_object_dict = %s' % (str(context), str(acquired_object_dict)))
+            my_acquisition_list = self.getSingleAcquiredCategoryMembershipList(context,
                         my_base_category,
                         portal_type=tuple(base_category_value.getAcquisitionPortalTypeList(())),                        
                         acquired_object_dict=acquired_object_dict)