Commit 10fd0d77 authored by Vincent Pelletier's avatar Vincent Pelletier

This patch attemps to keep activity number as low as possible during a full...

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.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15237 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f4291c41
...@@ -93,7 +93,7 @@ print "#### Indexing categories ####"\n ...@@ -93,7 +93,7 @@ print "#### Indexing categories ####"\n
folder_tag = \'module\'\n folder_tag = \'module\'\n
folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
object_tag = \'category\'\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 \n
context.portal_categories.activate(\n context.portal_categories.activate(\n
tag=folder_tag,\n tag=folder_tag,\n
...@@ -108,9 +108,9 @@ context.portal_categories.activate(\n ...@@ -108,9 +108,9 @@ context.portal_categories.activate(\n
print "#### Indexing alarms ####"\n print "#### Indexing alarms ####"\n
print "#### Indexing preferences ####"\n print "#### Indexing preferences ####"\n
folder_tag = \'module\'\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_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 object_priority = 2\n
for folder in [context.portal_alarms, context.portal_preferences]:\n for folder in [context.portal_alarms, context.portal_preferences]:\n
folder.activate(\n folder.activate(\n
...@@ -128,9 +128,9 @@ for folder in [context.portal_alarms, context.portal_preferences]:\n ...@@ -128,9 +128,9 @@ for folder in [context.portal_alarms, context.portal_preferences]:\n
# (ie. related quantity)\n # (ie. related quantity)\n
print "#### Indexing simulation ####"\n print "#### Indexing simulation ####"\n
folder_tag = \'module\'\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_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 object_priority = 3\n
context.portal_simulation.activate(\n context.portal_simulation.activate(\n
tag=folder_tag,\n tag=folder_tag,\n
...@@ -156,9 +156,9 @@ print "#### Indexing delivery builders ####"\n ...@@ -156,9 +156,9 @@ print "#### Indexing delivery builders ####"\n
print "#### Indexing order builders ####"\n print "#### Indexing order builders ####"\n
\n \n
folder_tag = \'module\'\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_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 object_priority = 2\n
for folder in [context.portal_templates, context.portal_trash,\n for folder in [context.portal_templates, context.portal_trash,\n
context.portal_domains, context.portal_rules,\n context.portal_domains, context.portal_rules,\n
......
365 368
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment