[gnue] r7384 - trunk/gnue-common/src/datasources/drivers/Base

[reinhard]

Author: reinhard
Date: 2005-04-15 17:38:14 -0500 (Fri, 15 Apr 2005)
New Revision: 7384

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Moved call to GDataSource._onRecordLoaded into RecordSet.


Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-15 
22:10:21 UTC (rev 7383)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-15 
22:38:14 UTC (rev 7384)
@@ -118,6 +118,9 @@
       for (field, value) in initialData.items ():
         self.__fields [field] = value
 
+      if self.__dataSource is not None:
+        self.__dataSource._onRecordLoaded (self)
+
     else:
 
       # New record:
@@ -138,6 +141,8 @@
       # 4. Query current data from the backend, if the primary key was
       #    initialized above.  This is used for appserver to retrieve the
       #    result of OnInit.
+      # TODO: Meanwhile I think it would be better to put this into appserver's
+      # Connection.initialize (and pass boundFields to that method).
       if self.__primarykeyFields:
         primarykeyIsComplete = True
         for fieldname in self.__primarykeyFields:

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
22:10:21 UTC (rev 7383)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
22:38:14 UTC (rev 7384)
@@ -202,9 +202,6 @@
 
     record = self.__createRecord (initialData = row)
 
-    if self.__dataSource is not None:
-      self.__dataSource._onRecordLoaded (record)
-
     return True
 
 
@@ -620,9 +617,6 @@
       if row:
         record = self.__createRecord (initialData = row)
 
-        if self.__dataSource is not None:
-          self.__dataSource._onRecordLoaded (record)
-
     # Move to record 0 if all preceding records were deleted
     # (or set to -1 if all records were deleted)
     if self._currentRecord < 0: