[Erp5-report] r14044 - /erp5/trunk/products/ERP5/Tool/IdTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Apr 11 11:13:12 2007
New Revision: 14044

URL: http://svn.erp5.org?rev=14044&view=rev
Log:
Revert my previous change, thish code does not have to handle the case where the table has been recreated: a line must be inserted automaticaly at table creation.

Modified:
    erp5/trunk/products/ERP5/Tool/IdTool.py

Modified: erp5/trunk/products/ERP5/Tool/IdTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/IdTool.py?rev=14044&r1=14043&r2=14044&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/IdTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/IdTool.py Wed Apr 11 11:13:12 2007
@@ -192,11 +192,6 @@
       id_group = repr(id_group)
     if not isinstance(default, int):
       default = 1
-    if self.dict_length_ids.get(id_group) is None:
-      self.dict_length_ids[id_group] = Length()
-    # If the table has been flushed, the latest stored id must be used if
-    # it's greater than the default value.
-    default = max(default, self.dict_length_ids[id_group]())
     # FIXME: A skin folder should be used to contain ZSQLMethods instead of
     # default catalog, like activity tool (anyway, it uses activity tool
     # ZSQLConnection, so hot reindexing is not helping here).
@@ -212,6 +207,8 @@
     finally:
       commit()
     new_id = result[0]['LAST_INSERT_ID()']
+    if self.dict_length_ids.get(id_group) is None:
+      self.dict_length_ids[id_group] = Length(new_id)
     self.dict_length_ids[id_group].set(new_id)
     return range(new_id - id_count, new_id)