[Erp5-report] r13528 - in /erp5/trunk/products/ERP5Type: Base.py Core/Folder.py

[nobody at svn.erp5.org]

Author: seb
Date: Tue Mar 20 22:34:31 2007
New Revision: 13528

URL: http://svn.erp5.org?rev=13528&view=rev
Log:
make consistent the way to manage activate_kw while we call reindex, also remove flushActivity into Folder

Modified:
    erp5/trunk/products/ERP5Type/Base.py
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=13528&r1=13527&r2=13528&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Tue Mar 20 22:34:31 2007
@@ -2205,13 +2205,17 @@
     """
     self._reindexObject(*args, **kw)
 
-  def _reindexObject(self, *args, **kw):
+  def _reindexObject(self, activate_kw=None, **kw):
     # When the activity supports group methods, portal_catalog/catalogObjectList is called instead of
     # immediateReindexObject.
     # Do not check if root is indexable, it is done into catalogObjectList,
     # so we will save time
+    if activate_kw is None:
+      activate_kw = {}
     if self.isIndexable:
-      self.activate(group_method_id='portal_catalog/catalogObjectList', alternate_method_id='alternateReindexObject', **kw).immediateReindexObject(*args, **kw)
+      self.activate(group_method_id='portal_catalog/catalogObjectList', 
+                    alternate_method_id='alternateReindexObject', 
+                    **activate_kw).immediateReindexObject(**kw)
 
   security.declarePublic('recursiveReindexObject')
   recursiveReindexObject = reindexObject

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=13528&r1=13527&r2=13528&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Tue Mar 20 22:34:31 2007
@@ -563,7 +563,7 @@
     self.recursiveReindexObject()
 
   security.declarePublic( 'recursiveReindexObject' )
-  def recursiveReindexObject(self, activate_kw={}, *args, **kw):
+  def recursiveReindexObject(self, activate_kw=None, **kw):
     """
       Fixes the hierarchy structure (use of Base class)
       XXXXXXXXXXXXXXXXXXXXXXXX
@@ -575,7 +575,7 @@
       self.activate(group_method_id='portal_catalog/catalogObjectList',
                     expand_method_id='getIndexableChildValueList',
                     alternate_method_id='alternateReindexObject',
-                    **activate_kw).recursiveImmediateReindexObject(*args, **kw)
+                    **activate_kw).recursiveImmediateReindexObject(**kw)
 
   security.declareProtected( Permissions.AccessContentsInformation,
                              'getIndexableChildValueList' )
@@ -592,23 +592,19 @@
     return value_list
 
   security.declarePublic( 'recursiveImmediateReindexObject' )
-  def recursiveImmediateReindexObject(self, *args, **kw):
+  def recursiveImmediateReindexObject(self, **kw):
       """
         Applies immediateReindexObject recursively
       """
       # Reindex self
       root_indexable = int(getattr(self.getPortalObject(),'isIndexable',1))
       if self.isIndexable and root_indexable:
-        # This might create a recursive lock
-        self.flushActivity(invoke=0, method_id='immediateReindexObject')
-        # This might create a recursive lock
-        self.flushActivity(invoke=0, method_id='recursiveImmediateReindexObject')
-        self.immediateReindexObject(*args, **kw)
+        self.immediateReindexObject(**kw)
       # Reindex contents
       for c in self.objectValues():
         if getattr(aq_base(c),
                    'recursiveImmediateReindexObject', None) is not None:
-          c.recursiveImmediateReindexObject(*args, **kw)
+          c.recursiveImmediateReindexObject(**kw)
 
   security.declareProtected( Permissions.ModifyPortalContent,
                              'recursiveMoveObject' )