[gnue] r7603 - in trunk: gnue-common/src/datasources gnue-common/src/datasources/drivers/Base gnue-reports/src/base

[reinhard]

Author: reinhard
Date: 2005-06-16 16:45:22 -0500 (Thu, 16 Jun 2005)
New Revision: 7603

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-reports/src/base/GRDataMapper.py
   trunk/gnue-reports/src/base/GRSources.py
Log:
Replaced masterResultSetChanged with standard event system.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-06-16 21:27:26 UTC 
(rev 7602)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-06-16 21:45:22 UTC 
(rev 7603)
@@ -435,14 +435,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Called by dbdrivers whenever this datasource's master has changed
-  # ---------------------------------------------------------------------------
-
-  def masterResultSetChanged(self, masterResultSet, detailResultSet):
-    pass
-
-
-  # ---------------------------------------------------------------------------
   # Create and activate a new result set
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-06-16 
21:27:26 UTC (rev 7602)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-06-16 
21:45:22 UTC (rev 7603)
@@ -487,8 +487,6 @@
         resultset = self.__cachedDetailResultSets [dataSource]
         if resultset.isPending () or int (gConfig ('CacheDetailRecords')):
           dataSource._activateResultSet (resultset)
-          # FIXME: This is only for compatibility and should be removed
-          dataSource.masterResultSetChanged (self, resultset)
           continue
         
       # If this record is empty anyway, it can't have any detail records, so

Modified: trunk/gnue-reports/src/base/GRDataMapper.py
===================================================================
--- trunk/gnue-reports/src/base/GRDataMapper.py 2005-06-16 21:27:26 UTC (rev 
7602)
+++ trunk/gnue-reports/src/base/GRDataMapper.py 2005-06-16 21:45:22 UTC (rev 
7603)
@@ -184,14 +184,9 @@
             pass
 
 
-  #  Used in GRSources.__connectMasterDetail to link detail datasource to
-  #  master source.  Called by the ResultSet when master changed
-  #  This will actually be over-written by GRDataMapper but at the time
-  #  the master-detail must be linked, the GRDataMapper will not have been
-  #  created yet.  [Yes, it's fugly]
-  def _masterChanged(self, masterResultSet, detailResultSet):
-    GDebug.printMesg (5, 'GRDataMapper._masterChanged on %s' % self.name)
-    self._resultsets.insert(0,detailResultSet)
+  def _dsResultSetActivated (self, event):
+    GDebug.printMesg (5, 'GRDataMapper._dsResultSetActivated on %s' % 
self.name)
+    self._resultsets.insert (0, event.resultSet)
 
 
   ##
@@ -280,7 +275,8 @@
       self.sourceMap[source] = [mapper]
       mapper.toplevel = 1
       mapper.datasource = self.sources.getDataSource(source)
-      mapper.datasource.masterResultSetChanged = mapper._masterChanged
+      mapper.datasource.registerEventListeners ({
+          'dsResultSetActivated': mapper._dsResultSetActivated})
     else:
       self.sourceMap[source][-1].grouping = 1
       self.sourceMap[source].append(mapper)

Modified: trunk/gnue-reports/src/base/GRSources.py
===================================================================
--- trunk/gnue-reports/src/base/GRSources.py    2005-06-16 21:27:26 UTC (rev 
7602)
+++ trunk/gnue-reports/src/base/GRSources.py    2005-06-16 21:45:22 UTC (rev 
7603)
@@ -62,18 +62,7 @@
     self._toplevelParent = 'GRReport'
     self.master = None
 
-  #  Used in GRSources.__connectMasterDetail to link detail datasource to
-  #  master source.  Called by the ResultSet when master changed
-  #  This will actually be over-written by GRDataMapper but at the time
-  #  the master-detail must be linked, the GRDataMapper will not have been
-  #  created yet. [Yes, it's fugly]
-  def masterResultSetChanged(self, masterResultSet, detailResultSet):
-    # [This is overwritten by GRDataMapper._masterChanged]
-    pass
 
-
-
-
 class GRConditions(GCondition):
   def __init__(self, parent):
     GCondition.__init__(self, parent, 'GRConditions')