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

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jun 26 14:32:50 2007
New Revision: 14978

URL: http://svn.erp5.org?rev=14978&view=rev
Log:
explicitely defined a group_id when reindexing object with a
sql_catalog_id defined, this is useful for hot reidexing

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=14978&r1=14977&r2=14978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Tue Jun 26 14:32:50 2007
@@ -2209,11 +2209,20 @@
     # 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:
+      if activate_kw is None:
+        activate_kw = {}
+
+      group_id_list  = []
+      if kw.get("group_id", "") not in ('', None):
+        group_id_list.append(kw.get("group_id", ""))
+      if kw.get("sql_catalog_id", "") not in ('', None):
+        group_id_list.append(kw.get("sql_catalog_id", ""))
+      group_id = ' '.join(group_id_list)
+
       self.activate(group_method_id='portal_catalog/catalogObjectList', 
-                    alternate_method_id='alternateReindexObject', 
+                    alternate_method_id='alternateReindexObject',
+                    group_id=group_id,
                     **activate_kw).immediateReindexObject(**kw)
 
   security.declarePublic('recursiveReindexObject')

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=14978&r1=14977&r2=14978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Tue Jun 26 14:32:50 2007
@@ -577,9 +577,18 @@
     if self.isIndexable:
       if activate_kw is None:
         activate_kw = {}
+
+      group_id_list  = []
+      if kw.get("group_id", "") not in ('', None):
+        group_id_list.append(kw.get("group_id", ""))
+      if kw.get("sql_catalog_id", "") not in ('', None):
+        group_id_list.append(kw.get("sql_catalog_id", ""))
+      group_id = ' '.join(group_id_list)
+
       self.activate(group_method_id='portal_catalog/catalogObjectList',
                     expand_method_id='getIndexableChildValueList',
                     alternate_method_id='alternateReindexObject',
+                    group_id=group_id,
                     **activate_kw).recursiveImmediateReindexObject(**kw)
 
   security.declareProtected( Permissions.AccessContentsInformation,