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

[reinhard]

Author: reinhard
Date: 2005-04-20 17:10:41 -0500 (Wed, 20 Apr 2005)
New Revision: 7445

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
Log:
Avoid duplicate resultset change notification.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-20 21:57:57 UTC 
(rev 7444)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-20 22:10:41 UTC 
(rev 7445)
@@ -460,8 +460,7 @@
   # ---------------------------------------------------------------------------
 
   def masterResultSetChanged(self, masterResultSet, detailResultSet):
-    self._masterResultSet = masterResultSet
-    self.__setResultSet (detailResultSet)
+    pass
 
 
   # ---------------------------------------------------------------------------
@@ -473,7 +472,7 @@
 
     resultSet = self._dataObject.createResultSet (conditions,
         readOnly = readOnly, masterRecord = masterRecord)
-    self.__setResultSet (resultSet)
+    self._activateResultSet (resultSet)
     return resultSet
 
 
@@ -515,7 +514,7 @@
 
     resultSet = self._dataObject.createEmptyResultSet (readOnly,
         masterRecord = masterRecord)
-    self.__setResultSet (resultSet)
+    self._activateResultSet (resultSet)
     return resultSet
 
 
@@ -523,7 +522,8 @@
   # Activate a result set
   # ---------------------------------------------------------------------------
 
-  def __setResultSet(self, resultSet):
+  def _activateResultSet (self, resultSet):
+
     self._currentResultSet = resultSet
     self.notifyResultSetListeners ()
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-20 
21:57:57 UTC (rev 7444)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-20 
22:10:41 UTC (rev 7445)
@@ -514,6 +514,7 @@
     if self._cachedDetailResultSets.has_key (dataSource):
       resultset = self._cachedDetailResultSets [dataSource]
       if resultset.isPending () or int (gConfig ('CacheDetailRecords')):
+        dataSource._activateResultSet (resultset)
         return resultset
 
     # If this record is empty anyway, it can't have any detail records, so