[Erp5-report] r44456 aurel - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplate...

[nobody at svn.erp5.org]

Author: aurel
Date: Mon Mar 21 10:38:16 2011
New Revision: 44456

URL: http://svn.erp5.org?rev=44456&view=rev
Log:
while reindexing a folder if the Archive_test script exists, use it

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexAll.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexAll.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexAll.xml?rev=44456&r1=44455&r2=44456&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexAll.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexAll.xml [utf8] Mon Mar 21 10:38:16 2011
@@ -92,7 +92,7 @@ def Folder_reindexObjectList(id_list_lis
      sql_catalog_id=sql_catalog_id,\n
      passive_commit=passive_commit,\n
   )\n
-\n
+archive_test_script = getattr(context.getPortalObject(), "Archive_test", None)\n
 try:\n
   tree_id_list = folder.getTreeIdList()\n
 except (NotImplementedError, AttributeError):\n
@@ -112,24 +112,31 @@ except (NotImplementedError, AttributeEr
   if remaining_object_id_count > 0:\n
     id_list_list.append(id_list[-remaining_object_id_count:])\n
   Folder_reindexObjectList(id_list_list)\n
-else:  \n
-  if start_tree is not None:\n
-    new_tree_id_list = []  \n
+else:\n
+  if archive_test_script is not None:\n
+    new_tree_id_list = []\n
     for tree_id in tree_id_list:\n
-      if tree_id >= start_tree:\n
-        new_tree_id_list.append(tree_id)\n
-    tree_id_list = new_tree_id_list\n
-    \n
-  if stop_tree is not None:\n
-    new_tree_id_list = []  \n
-    for tree_id in tree_id_list:\n
-      if tree_id < stop_tree:\n
+      if folder.Archive_test(tree_id=tree_id, start_tree=start_tree, stop_tree=stop_tree):\n
         new_tree_id_list.append(tree_id)\n
     tree_id_list = new_tree_id_list\n
+  else:\n
+    if start_tree is not None:\n
+      new_tree_id_list = []\n
+      for tree_id in tree_id_list:\n
+        if tree_id >= start_tree:\n
+          new_tree_id_list.append(tree_id)\n
+      tree_id_list = new_tree_id_list\n
+\n
+    if stop_tree is not None:\n
+      new_tree_id_list = []\n
+      for tree_id in tree_id_list:\n
+        if tree_id < stop_tree:\n
+          new_tree_id_list.append(tree_id)\n
+      tree_id_list = new_tree_id_list\n
 \n
   if len(tree_id_list) == 0:\n
     return\n
-        \n
+\n
   i = 0\n
 \n
   tree_tag = "%s_tree" % folder_id\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=44456&r1=44455&r2=44456&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Mon Mar 21 10:38:16 2011
@@ -1 +1 @@
-40936
\ No newline at end of file
+40937
\ No newline at end of file