[gnue] r7446 - in trunk/gnue-common/src/datasources: . drivers/Base

[reinhard]

Author: reinhard
Date: 2005-04-20 17:16:59 -0500 (Wed, 20 Apr 2005)
New Revision: 7446

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
Log:
Moved some more stuff from DataObject to GDataSource. We're getting close to
phasing out DataObject completely.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-20 22:10:41 UTC 
(rev 7445)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-20 22:16:59 UTC 
(rev 7446)
@@ -259,11 +259,13 @@
       if not hasattr (self, 'masterlink'):
         raise Exceptions.MissingMasterlinkError (self.name)
       self._masterPkFields = [s.strip () for s in self.masterlink.split (',')]
+      self.__master.referenceFields (self._masterPkFields)
 
       # Get the foreign key fields from the "detaillink" attribute
       if not hasattr (self, 'detaillink'):
         raise Exceptions.MissingDetaillinkError (self.name)
       self._masterFkFields = [s.strip () for s in self.detaillink.split (',')]
+      self.referenceFields (self._masterFkFields)
 
       # Check if the number of fields matches
       if len (self._masterPkFields) != len (self._masterFkFields):

Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-20 22:10:41 UTC (rev 7445)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-20 22:16:59 UTC (rev 7446)
@@ -98,27 +98,9 @@
         dataSource       = self.__dataSource)
 
 
-  # Add a detail data object.  This dataobject will create a new resultset
-  # everytime this dataobject changes (new record, etc).  The optional
-  # handler will be called after the detail dataobject is notified.  The
-  # client application may wish to add a handler to know when the detail
-  # has been requeried.  handler is a method that takes two arguments:
-  # the master ResultSet and the detail ResultSet
   def addDetailDataObject(self, dataObject, handler=None):
-
-    GDebug.printMesg (8,"Adding a master/detail relationship to DataObject")
-
-    # Make sure "master" fields will be in our future query
-    for field in dataObject.__dataSource._masterPkFields:
-      self.__dataSource._fieldReferences[string.strip(field)] = ""
-
-    for field in dataObject.__dataSource._masterFkFields:
-      dataObject.__dataSource._fieldReferences[string.strip(field)] = ""
-
     self._detailObjects.append ([dataObject, handler])
 
-  # Called when new record master in master/detail is queried
   def _masterRecordChanged(self, master):
-
     return master.current.addDetailResultSet(self.__dataSource,
           self.__dataSource._masterPkFields)