Commit dfb0efae authored by Aurel's avatar Aurel

while reindexing a folder if the Archive_test script exists, use it

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44456 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 13d10c93
...@@ -92,7 +92,7 @@ def Folder_reindexObjectList(id_list_list):\n ...@@ -92,7 +92,7 @@ def Folder_reindexObjectList(id_list_list):\n
sql_catalog_id=sql_catalog_id,\n sql_catalog_id=sql_catalog_id,\n
passive_commit=passive_commit,\n passive_commit=passive_commit,\n
)\n )\n
\n archive_test_script = getattr(context.getPortalObject(), "Archive_test", None)\n
try:\n try:\n
tree_id_list = folder.getTreeIdList()\n tree_id_list = folder.getTreeIdList()\n
except (NotImplementedError, AttributeError):\n except (NotImplementedError, AttributeError):\n
...@@ -112,16 +112,23 @@ except (NotImplementedError, AttributeError):\n ...@@ -112,16 +112,23 @@ except (NotImplementedError, AttributeError):\n
if remaining_object_id_count > 0:\n if remaining_object_id_count > 0:\n
id_list_list.append(id_list[-remaining_object_id_count:])\n id_list_list.append(id_list[-remaining_object_id_count:])\n
Folder_reindexObjectList(id_list_list)\n Folder_reindexObjectList(id_list_list)\n
else: \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 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 if start_tree is not None:\n
new_tree_id_list = [] \n new_tree_id_list = []\n
for tree_id in tree_id_list:\n for tree_id in tree_id_list:\n
if tree_id >= start_tree:\n if tree_id >= start_tree:\n
new_tree_id_list.append(tree_id)\n new_tree_id_list.append(tree_id)\n
tree_id_list = new_tree_id_list\n tree_id_list = new_tree_id_list\n
\n \n
if stop_tree is not None:\n if stop_tree is not None:\n
new_tree_id_list = [] \n new_tree_id_list = []\n
for tree_id in tree_id_list:\n for tree_id in tree_id_list:\n
if tree_id < stop_tree:\n if tree_id < stop_tree:\n
new_tree_id_list.append(tree_id)\n new_tree_id_list.append(tree_id)\n
...@@ -129,7 +136,7 @@ else: \n ...@@ -129,7 +136,7 @@ else: \n
\n \n
if len(tree_id_list) == 0:\n if len(tree_id_list) == 0:\n
return\n return\n
\n \n
i = 0\n i = 0\n
\n \n
tree_tag = "%s_tree" % folder_id\n tree_tag = "%s_tree" % folder_id\n
......
40936 40937
\ 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