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

[reinhard]

Author: reinhard
Date: 2005-04-19 16:15:13 -0500 (Tue, 19 Apr 2005)
New Revision: 7425

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Cleanup.


Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-19 20:56:43 UTC (rev 7424)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-19 21:15:13 UTC (rev 7425)
@@ -102,6 +102,8 @@
         boundFields      = self.__dataSource._fieldReferences.keys (),
         readonly         = readOnly,
         masterRecord     = masterRecord,
+        masterKeyFields  = self._masterfields,
+        masterLinkFields = self._detailfields,
         dataSource       = self.__dataSource)
 
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-19 
20:56:43 UTC (rev 7424)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-19 
21:15:13 UTC (rev 7425)
@@ -48,36 +48,66 @@
       boundFields      = [],
       readonly         = False,
       masterRecord     = None,
+      masterKeyFields  = [],
+      masterLinkFields = [],
       dataSource       = None):
+    """
+    Create a new ResultSet instance.
 
-     self._dataObject        = dataObject
-     self.__defaultData      = defaultData
-     self.__connection       = connection
-     self.__tablename        = tablename
-     self.__rowidField       = rowidField
-     self.__primarykeyFields = primarykeyFields
-     self.__boundFields      = boundFields
-     self.__readonly         = readonly
-     self.__masterRecord     = masterRecord
-     self.__dataSource       = dataSource
+    @param defaultData: Dictionary with default data to be used whenever a new
+      record is inserted in this ResultSet.
+    @param connection: GConnection object the ResultSet object can use to query
+      data and post changes.
+    @param tablename: Table name.
+    @param rowidField: Field name of the field containing a unique row id
+      generated by the backend, if available.
+    @param primaryKeyFields: List of field names that make up a unique key, if
+      available.
+    @param boundFields: List of fields to be included when posting changes to
+      the backend. All fields not in this list are considered unbound fields
+      and are not persistent.
+    @param readonly: True if the ResultSet is read only. If set, an attempt to
+      insert, modify or delete any record in this RecordSet raises an
+      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 dataSource: GDataSource instance to notify of data events.
+    """
 
-     self._cachedRecords = []
-     self._currentRecord = -1
-     self._recordCount = 0
-     self._postingRecord = None
+    self._dataObject        = dataObject
+    self.__defaultData      = defaultData
+    self.__connection       = connection
+    self.__tablename        = tablename
+    self.__rowidField       = rowidField
+    self.__primarykeyFields = primarykeyFields
+    self.__boundFields      = boundFields
+    self.__readonly         = readonly
+    self.__masterRecord     = masterRecord
+    self.__masterKeyFields  = masterKeyFields
+    self.__masterLinkFields = masterLinkFields
+    self.__dataSource       = dataSource
 
-     # Objects to get informed about record navigation events
-     self.__listeners = []
+    self._cachedRecords = []
+    self._currentRecord = -1
+    self._recordCount = 0
+    self._postingRecord = None
 
-     # Generator to yield fieldname/value dictionaries
-     self.__generator = None
+    # Objects to get informed about record navigation events
+    self.__listeners = []
 
-     # Records that have to be requeried after the post
-     self.__recordsToRequery = []
+    # Generator to yield fieldname/value dictionaries
+    self.__generator = None
 
-     self.current = None
+    # Records that have to be requeried after the post
+    self.__recordsToRequery = []
 
+    self.current = None
 
+
   # ---------------------------------------------------------------------------
   # Execute a query
   # ---------------------------------------------------------------------------
@@ -169,8 +199,8 @@
         boundFields      = self.__boundFields,
         readonly         = self.__readonly,
         masterRecord     = self.__masterRecord,
-        masterKeyFields  = self._dataObject._masterfields,
-        masterLinkFields = self._dataObject._detailfields,
+        masterKeyFields  = self.__masterKeyFields,
+        masterLinkFields = self.__masterLinkFields,
         dataSource       = self.__dataSource)
 
     if position is None: