Commit 780e0b02 authored by Aurel's avatar Aurel

use getCurrentArchive to know which one must be cancelled at end of archiving


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17895 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c00b7b99
...@@ -283,22 +283,19 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -283,22 +283,19 @@ class ZCatalog(Folder, Persistent, Implicit):
""" """
Exchange databases and finish reindexing in the same transaction. Exchange databases and finish reindexing in the same transaction.
""" """
if self.archive_path is not None and \
getattr(self, "portal_archives", None) is not None:
current_archive = self.portal_archives.getCurrentArchive()
else:
current_archive = None
default_catalog_id = self.default_sql_catalog_id default_catalog_id = self.default_sql_catalog_id
self.exchangeDatabases(source_sql_catalog_id=source_sql_catalog_id, self.exchangeDatabases(source_sql_catalog_id=source_sql_catalog_id,
destination_sql_catalog_id=destination_sql_catalog_id, destination_sql_catalog_id=destination_sql_catalog_id,
skin_selection_dict=skin_selection_dict, skin_selection_dict=skin_selection_dict,
sql_connection_id_dict=sql_connection_id_dict) sql_connection_id_dict=sql_connection_id_dict)
# cancel archive use as current catalog before archive # cancel archive use as current catalog before archiving
if self.archive_path is not None and \ if current_archive is not None:
getattr(self, "portal_archives", None) is not None: current_archive.cancel()
if len(self.portal_archives):
archive_list = self.portal_archives.getArchiveList()
for archive_path in archive_list:
archive = self.unrestrictedTraverse(archive_path)
if archive.getCatalogId() == default_catalog_id:
# this is the current catalog used for archiving
archive.cancel()
self.setHotReindexingState(state=HOT_REINDEXING_FINISHED_STATE) self.setHotReindexingState(state=HOT_REINDEXING_FINISHED_STATE)
clearCache(cache_factory_list=('erp5_content_short',)) clearCache(cache_factory_list=('erp5_content_short',))
......
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