From d2dfd8170ffd324a66588125a146bb2cb2ddca26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 13 Dec 2007 09:31:14 +0000
Subject: [PATCH] finish hot reindexing must be called after final
 InventoryModule_reindexMovementList

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18294 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ZSQLCatalog/ZSQLCatalog.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/product/ZSQLCatalog/ZSQLCatalog.py b/product/ZSQLCatalog/ZSQLCatalog.py
index a557ef1182..cde1a6fbb2 100644
--- a/product/ZSQLCatalog/ZSQLCatalog.py
+++ b/product/ZSQLCatalog/ZSQLCatalog.py
@@ -321,7 +321,8 @@ class ZCatalog(Folder, Persistent, Implicit):
       object_path = self.getPhysicalPath()
       # Activities must be removed in the reverse order they were inserted
       # to make sure removing one does not accidntaly trigger the next one.
-      method_id_list = ('finishHotReindexing', 'runInventoryMethod', 'playBackRecordedObjectList',
+      method_id_list = ('finishHotReindexing', 'runInventoryMethod',
+                        'playBackRecordedObjectList', 'InventoryModule_reindexMovementList'
                         'setHotReindexingState')
       for method_id in method_id_list:
         portal_activities.flush(object_path, method_id=method_id)
@@ -530,8 +531,9 @@ class ZCatalog(Folder, Persistent, Implicit):
     # Once there is nothing to replay, databases are sync'ed, so the new
     # catalog can become current.
     self.activate(passive_commit=1,
-                  after_method_id=('playBackRecordedObjectList', 'runInventoryMethod'),
-                  after_tag='runInventoryMethod',
+                  after_method_id=('playBackRecordedObjectList',
+                                   'InventoryModule_reindexMovementList'),
+                  after_tag='InventoryModule_reindexMovementList',
                   priority=5).finishHotReindexing(
                       source_sql_catalog_id=source_sql_catalog_id,
                       destination_sql_catalog_id=destination_sql_catalog_id,
-- 
2.30.9