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

[reinhard]

Author: reinhard
Date: 2005-04-20 16:12:06 -0500 (Wed, 20 Apr 2005)
New Revision: 7442

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Better and more consistent variable names for master/detail links.


Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-20 21:07:17 UTC (rev 7441)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-20 21:12:06 UTC (rev 7442)
@@ -93,8 +93,8 @@
         boundFields      = self.__dataSource._fieldReferences.keys (),
         readonly         = readOnly,
         masterRecord     = masterRecord,
-        masterKeyFields  = self.__dataSource._masterPkFields,
-        masterLinkFields = self.__dataSource._masterFkFields,
+        masterPkFields   = self.__dataSource._masterPkFields,
+        masterFkFields   = self.__dataSource._masterFkFields,
         dataSource       = self.__dataSource)
 
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-20 
21:07:17 UTC (rev 7441)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-20 
21:12:06 UTC (rev 7442)
@@ -47,8 +47,8 @@
       boundFields      = [],
       readonly         = False,
       masterRecord     = None,
-      masterKeyFields  = [],
-      masterLinkFields = [],
+      masterPkFields   = [],
+      masterFkFields   = [],
       dataSource       = None):
     """
     Create a new RecordSet instance.
@@ -71,9 +71,9 @@
       modify or delete this record raises an exception.
     @param masterRecord: RecordSet instance of the master of this record, or
       None if this record has no master.
-    @param masterKeyFields: Fields in the master record matching the
-      masterLinkFields in this record.
-    @param masterLinkFields: Fields in this record matching the masterKeyFields
+    @param masterPkFields: Fields in the master record matching the
+      masterFkFields in this record.
+    @param masterFkFields: Fields in this record matching the masterPkFields
       of the master record.
     @param dataSource: GDataSource instance to notify of data events.
     """
@@ -85,8 +85,8 @@
     self.__boundFields      = boundFields
     self.__readonly         = readonly
     self.__masterRecord     = masterRecord
-    self.__masterKeyFields  = masterKeyFields
-    self.__masterLinkFields = masterLinkFields
+    self.__masterPkFields   = masterPkFields
+    self.__masterFkFields   = masterFkFields
     self.__dataSource       = dataSource
 
     # Record status
@@ -542,8 +542,8 @@
   def __setMasterLink (self):
 
     if self.__masterRecord is not None:
-      for (key, link) in zip (self.__masterKeyFields, self.__masterLinkFields):
-        self.__setField (link, self.__masterRecord.getField (key))
+      for (pk, fk) in zip (self.__masterPkFields, self.__masterFkFields):
+        self.__setField (fk, self.__masterRecord.getField (pk))
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-20 
21:07:17 UTC (rev 7441)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-20 
21:12:06 UTC (rev 7442)
@@ -48,8 +48,8 @@
       boundFields      = [],
       readonly         = False,
       masterRecord     = None,
-      masterKeyFields  = [],
-      masterLinkFields = [],
+      masterPkFields   = [],
+      masterFkFields   = [],
       dataSource       = None):
     """
     Create a new ResultSet instance.
@@ -71,10 +71,10 @@
       exception.
     @param masterRecord: RecordSet instance of the master of this result set,
       or None if this result set has no master.
-    @param masterKeyFields: Fields in the master record matching the
-      masterLinkFields in the records of this result set.
-    @param masterLinkFields: Fields in the records of this result set matching
-      the masterKeyFields of the master record.
+    @param masterPkFields: Fields in the master record matching the
+      masterFkFields in the records of this result set.
+    @param masterFkFields: Fields in the records of this result set matching
+      the masterPkFields of the master record.
     @param dataSource: GDataSource instance to notify of data events.
     """
 
@@ -87,8 +87,8 @@
     self.__boundFields      = boundFields
     self.__readonly         = readonly
     self.__masterRecord     = masterRecord
-    self.__masterKeyFields  = masterKeyFields
-    self.__masterLinkFields = masterLinkFields
+    self.__masterPkFields   = masterPkFields
+    self.__masterFkFields   = masterFkFields
     self.__dataSource       = dataSource
 
     self._cachedRecords = []
@@ -199,8 +199,8 @@
         boundFields      = self.__boundFields,
         readonly         = self.__readonly,
         masterRecord     = self.__masterRecord,
-        masterKeyFields  = self.__masterKeyFields,
-        masterLinkFields = self.__masterLinkFields,
+        masterPkFields   = self.__masterPkFields,
+        masterFkFields   = self.__masterFkFields,
         dataSource       = self.__dataSource)
 
     if position is None: