[gnue] r10310 - in trunk/gnue-reports: . src/base

[reinhard]

Author: reinhard
Date: 2011-03-16 09:41:25 -0500 (Wed, 16 Mar 2011)
New Revision: 10310

Modified:
   trunk/gnue-reports/
   trunk/gnue-reports/src/base/GRDataMapper.py
Log:
Correct fix for dsResultSetActivated being called for "None" resultset.



Property changes on: trunk/gnue-reports
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2011-03-16 13:52:10.986999989 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: reports

   + timestamp: 2011-03-16 15:37:20.466000080 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: reports

Name: bzr:revision-id:v4
   - 604 address@hidden
605 address@hidden
606 address@hidden
607 address@hidden

   + 604 address@hidden
605 address@hidden
606 address@hidden
607 address@hidden
608 address@hidden


Modified: trunk/gnue-reports/src/base/GRDataMapper.py
===================================================================
--- trunk/gnue-reports/src/base/GRDataMapper.py 2011-03-16 14:41:22 UTC (rev 
10309)
+++ trunk/gnue-reports/src/base/GRDataMapper.py 2011-03-16 14:41:25 UTC (rev 
10310)
@@ -189,7 +189,8 @@
 
   def _dsResultSetActivated (self, event):
     assert gDebug (5, 'GRDataMapper._dsResultSetActivated on %s' % self.name)
-    self._resultsets.insert (0, event.resultSet)
+    if event.resultSet is not None:
+        self._resultsets.insert (0, event.resultSet)
 
 
   ##
@@ -327,7 +328,7 @@
     else:
       assert gDebug(4, 'Getting pre-created ResultSet for source "%s"; 
parent=%s' \
              % (source, controlSection.parent))
-      controlSection.resultset = controlSection._resultsets.pop(0)
+      controlSection.resultset = controlSection._resultsets.pop()
 #      resultset = 
self.sourceMap[controlSection.parent.source].resultset.current.
       if controlSection.resultset.nextRecord():
         controlSection.__nextRecord = controlSection.resultset.current