[Erp5-report] r15237 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Jul 17 17:38:04 2007
New Revision: 15237

URL: http://svn.erp5.org?rev=15237&view=rev
Log:
This patch attemps to keep activity number as low as possible during a full site reindexation. This helps CMFActivity finding activities which it can actually execute.
Prevent Folder_reindexAll activities from being executed when we know the expanded method will be blocked by pending activities : copy existing after_tags for expanded activities to the Folder_reindexAll activity when it lacks them.
Remove "module" from after_tag.
Prevent duplication of after_tag definition: expanded activities are defined after the expander tags, optionnaly with more tags appended.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml?rev=15237&r1=15236&r2=15237&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml Tue Jul 17 17:38:04 2007
@@ -93,7 +93,7 @@
 folder_tag = \'module\'\n
 folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'category\'\n
-object_after_tag = (\'module\', \'person_stage_1\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 \n
 context.portal_categories.activate(\n
                   tag=folder_tag,\n
@@ -108,9 +108,9 @@
 print "#### Indexing alarms ####"\n
 print "#### Indexing preferences ####"\n
 folder_tag = \'module\'\n
-folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'document\'\n
-object_after_tag = (\'module\', \'category\', \'person_stage_1\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 object_priority = 2\n
 for folder in [context.portal_alarms, context.portal_preferences]:\n
   folder.activate(\n
@@ -128,9 +128,9 @@
 # (ie. related quantity)\n
 print "#### Indexing simulation ####"\n
 folder_tag = \'module\'\n
-folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'document\', \'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'simulation\'\n
-object_after_tag = (\'module\', \'category\', \'person_stage_1\', \'document\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 object_priority = 3\n
 context.portal_simulation.activate(\n
                   tag=folder_tag,\n
@@ -156,9 +156,9 @@
 print "#### Indexing order builders ####"\n
 \n
 folder_tag = \'module\'\n
-folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'document\'\n
-object_after_tag = (\'module\', \'category\', \'person_stage_1\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 object_priority = 2\n
 for folder in [context.portal_templates, context.portal_trash,\n
                context.portal_domains, context.portal_rules,\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=15237&r1=15236&r2=15237&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Jul 17 17:38:04 2007
@@ -1,1 +1,1 @@
-365
+368