Author: reinhard
Date: 2005-10-04 03:25:55 -0500 (Tue, 04 Oct 2005)
New Revision: 8036
Modified:
trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Fixed merge for deletion of more than one detail record at once.
Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-10-04
05:05:24 UTC (rev 8035)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-10-04
08:25:55 UTC (rev 8036)
@@ -732,9 +732,11 @@
newData = otherResultSet.getDictArray (keyFields, self.__boundFields)
- for (index, record) in enumerate (self.__cachedRecords [:]):
+ index = 0
+ for record in self.__cachedRecords [:]:
if record.isEmpty ():
# keep empty record in old ResultSet
+ index += 1
continue
d = newData
for field in keyFields:
@@ -749,6 +751,7 @@
record._initialDataFromDict (d)
# And set to empty dict to indicate it has been processed
d.clear ()
+ index += 1
else:
# Not found in newData - delete it
self.__removeRecord (index)
_______________________________________________
Commit-gnue mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnue
