Commit 9b9519d5 authored by Ayush Tiwari's avatar Ayush Tiwari

multiple_catalog: Check for validation_state before indexing in the catalog

parent 67b62203
...@@ -719,6 +719,8 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -719,6 +719,8 @@ class ZCatalog(Folder, Persistent, Implicit):
catalog_id_list = self.getERP5CatalogIdList() catalog_id_list = self.getERP5CatalogIdList()
for sql_catalog_id in catalog_id_list: for sql_catalog_id in catalog_id_list:
catalog = self.getSQLCatalog(sql_catalog_id) catalog = self.getSQLCatalog(sql_catalog_id)
if not catalog.getValidationState() == 'validated':
continue
hot_reindexing = (self.hot_reindexing_state is not None) and \ hot_reindexing = (self.hot_reindexing_state is not None) and \
(catalog is not None) and \ (catalog is not None) and \
(self.source_sql_catalog_id == catalog.id) (self.source_sql_catalog_id == catalog.id)
...@@ -887,6 +889,8 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -887,6 +889,8 @@ class ZCatalog(Folder, Persistent, Implicit):
catalog_id_list = self.getERP5CatalogIdList() catalog_id_list = self.getERP5CatalogIdList()
for sql_catalog_id in catalog_id_list: for sql_catalog_id in catalog_id_list:
catalog = self.getSQLCatalog(sql_catalog_id) catalog = self.getSQLCatalog(sql_catalog_id)
if not catalog.getValidationState() == 'validated':
continue
if catalog is not None: if catalog is not None:
catalog.uncatalogObject(uid=uid,path=path) catalog.uncatalogObject(uid=uid,path=path)
if self.hot_reindexing_state is not None and self.source_sql_catalog_id == catalog.id: if self.hot_reindexing_state is not None and self.source_sql_catalog_id == catalog.id:
...@@ -908,6 +912,8 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -908,6 +912,8 @@ class ZCatalog(Folder, Persistent, Implicit):
for sql_catalog_id in catalog_id_list: for sql_catalog_id in catalog_id_list:
catalog = self.getSQLCatalog(sql_catalog_id) catalog = self.getSQLCatalog(sql_catalog_id)
if not catalog.getValidationState() == 'validated':
continue
if catalog is not None: if catalog is not None:
catalog.beforeUncatalogObject(uid=uid,path=path) catalog.beforeUncatalogObject(uid=uid,path=path)
......
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