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

[reinhard]

Author: reinhard
Date: 2005-04-11 16:05:49 -0500 (Mon, 11 Apr 2005)
New Revision: 7334

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
Log:
Made RecordSet._initialData private.


Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-11 
18:48:32 UTC (rev 7333)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-11 
21:05:49 UTC (rev 7334)
@@ -69,9 +69,9 @@
     self.__detailLinkFlags = {}
 
     # Dictionary with field:value pairs of initial data
-    self._initialData = initialData.copy ()     # don't touch the parameter!
+    self.__initialData = initialData.copy ()     # don't touch the parameter!
 
-    if self._initialData and len (self._initialData):
+    if self.__initialData and len (self.__initialData):
 
       # Existing record:
       # Set the current state of all fields as given in the parameter
@@ -110,7 +110,7 @@
             primarykeyIsComplete = False
             break
         if primarykeyIsComplete:
-          self._initialData = self._fields.copy ()
+          self.__initialData = self._fields.copy ()
           self.requery ()
 
       # 5. Get default values from DataSource.  This has to be done at the very
@@ -315,18 +315,18 @@
 
     # First priority: row id
     if self.__rowidField:
-      result [self.__rowidField] = self._initialData [self.__rowidField]
+      result [self.__rowidField] = self.__initialData [self.__rowidField]
 
     # Second priority: primary key
     elif self.__primarykeyFields:
       for field in self.__primarykeyFields:
-        result [field] = self._initialData [field]
+        result [field] = self.__initialData [field]
 
     # If all else fails, use all fields in the where clause
     else:
-      for field in self._initialData.keys ():
+      for field in self.__initialData.keys ():
         if self._parent.isFieldBound (field):
-          result [field] = self._initialData [field]
+          result [field] = self.__initialData [field]
 
     return result
 
@@ -340,7 +340,7 @@
     do = self._parent._dataObject
     newfields = do._connection.requery (do.table, self.__wherefields (),
                                         fields)
-    self._initialData.update (newfields)
+    self.__initialData.update (newfields)
     self._fields.update (newfields)
 
 
@@ -420,7 +420,7 @@
           rowid = do._connection.insert (do.table, modifiedFields, 
recordNumber)
           if self.__rowidField:
             self._fields [self.__rowidField] = rowid
-            self._initialData [self.__rowidField] = rowid
+            self.__initialData [self.__rowidField] = rowid
             # Requery all the fields that are important for inserting details.
             # A backend trigger could have e.g. generated a primary key.
             if self.__detailLinkFlags:
@@ -434,7 +434,7 @@
         self._insertFlag    = False
         self._updateFlag    = False
         self._modifiedFlags = {}
-        self._initialData   = self._fields.copy ()
+        self.__initialData   = self._fields.copy ()
 
     # Post all detail records
     for child in (self._cachedDetailResultSets.values ()):