[Erp5-report] r13529 - /erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py

[nobody at svn.erp5.org]

Author: seb
Date: Tue Mar 20 22:44:47 2007
New Revision: 13529

URL: http://svn.erp5.org?rev=13529&view=rev
Log:
make sure we do not try to retrieve a delete object in playBackRecordedObjectList, this makes hot reindexing stable at least on a single machine

Modified:
    erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py?rev=13529&r1=13528&r2=13529&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/ZSQLCatalog.py Tue Mar 20 22:44:47 2007
@@ -328,19 +328,19 @@
     result = catalog_object.readRecordedObjectList(catalog=catalog)
     if len(result):
       for o in result:
-        try:
-          obj = self.resolve_path(o.path)
-        except ConflictError:
-          raise
-        except:
-          obj = None
-        if obj is not None:
-          if catalog == 0:
-            self.uncatalog_object(o.path, sql_catalog_id=sql_catalog_id)
-          elif catalog == 1:
+        if catalog==0:
+          self.uncatalog_object(uid=o.path, sql_catalog_id=sql_catalog_id)
+        elif catalog==1:
+          try:
+            obj = self.resolve_path(o.path)
+          except ConflictError:
+            raise
+          except:
+            obj = None
+          if obj is not None:
             obj.reindexObject(sql_catalog_id=sql_catalog_id)
-          else:
-            raise ValueError, '%s is not a valid value for "catalog".' % (catalog, )
+        else:
+          raise ValueError, '%s is not a valid value for "catalog".' % (catalog, )
       catalog_object.deleteRecordedObjectList(uid_list=[o.uid for o in result])
       # Re-schedule the same action in case there are remaining rows in the
       # table. This can happen if the database connector limits the number