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 <reinhard.muel...@bytewise.at>
properties:
branch-nick: reports
+ timestamp: 2011-03-16 15:37:20.466000080 +0100
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
properties:
branch-nick: reports
Name: bzr:revision-id:v4
- 604 reinhard.muel...@bytewise.at-20100426083602-n7lwmoxjctbo4ktk
605 reinhard.muel...@bytewise.at-20101114183425-7ey0anwrt2820izg
606 reinhard.muel...@bytewise.at-20110315130815-gh5d46y2tqfjy3x3
607 reinhard.muel...@bytewise.at-20110316125210-evrwzzfuj2v457ad
+ 604 reinhard.muel...@bytewise.at-20100426083602-n7lwmoxjctbo4ktk
605 reinhard.muel...@bytewise.at-20101114183425-7ey0anwrt2820izg
606 reinhard.muel...@bytewise.at-20110315130815-gh5d46y2tqfjy3x3
607 reinhard.muel...@bytewise.at-20110316125210-evrwzzfuj2v457ad
608 reinhard.muel...@bytewise.at-20110316143720-r1pigpmci8ny8kem
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
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
