gnue/reports TODO src/GRDataMapper.py src/GRLay...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/08/27 11:53:01

Modified files:
        reports        : TODO 
        reports/src    : GRDataMapper.py GRLayout.py 

Log message:
        fixed incorrect resetting of summaries; misc bug fixes (esp. 
w/mailmerge)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/TODO.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRDataMapper.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRLayout.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: gnue/reports/TODO
diff -c gnue/reports/TODO:1.6 gnue/reports/TODO:1.7
*** gnue/reports/TODO:1.6       Wed May 29 21:30:33 2002
--- gnue/reports/TODO   Tue Aug 27 11:53:01 2002
***************
*** 22,27 ****
--- 22,29 ----
  
   * Decide on a "formal" output markup.
  
+  * [BUG] Currently, <parameters> has to fall before <sources>. 
+ 
  
  ROADMAP
  
Index: gnue/reports/src/GRDataMapper.py
diff -c gnue/reports/src/GRDataMapper.py:1.16 
gnue/reports/src/GRDataMapper.py:1.17
*** gnue/reports/src/GRDataMapper.py:1.16       Thu May 30 18:26:17 2002
--- gnue/reports/src/GRDataMapper.py    Tue Aug 27 11:53:01 2002
***************
*** 138,144 ****
    #
    # Zero out the summary data
    #
!   def _clearSummaries(self):
      for field in self.summaries.keys():
        for function in self.summaries[field].keys():
          self.summaries[field][function] = None
--- 138,144 ----
    #
    # Zero out the summary data
    #
!   def clearSummaries(self):
      for field in self.summaries.keys():
        for function in self.summaries[field].keys():
          self.summaries[field][function] = None
***************
*** 358,365 ****
        for s in self.sourceMap[source]:
  
          # Reset running summary counts if necessary...
-         if firstSection and firstSection != controlSection._lastSection:
-           s._clearSummaries()
  
          changed = s._precheckNextFields(recordset)
  
--- 358,363 ----
***************
*** 368,373 ****
--- 366,372 ----
            GDebug.printMesg(10, "After next record, first changed section is 
%s" % s.name)
            firstSection = s.name
  
+ 
          # Save the new field values in the data handler
          for field in s.fields.keys():
            s.fields[field] = recordset.getField(field)
***************
*** 402,408 ****
  # Contains all "summary" functions that
  # depend on other record keeping. (e.g.,
  # 'averages' need the total and the count
! # tracked.
  #
  _summMultiMapping = { 'avg': ('sum','count'),
                      }
--- 401,407 ----
  # Contains all "summary" functions that
  # depend on other record keeping. (e.g.,
  # 'averages' need the total and the count
! # tracked.)
  #
  _summMultiMapping = { 'avg': ('sum','count'),
                      }
Index: gnue/reports/src/GRLayout.py
diff -c gnue/reports/src/GRLayout.py:1.36 gnue/reports/src/GRLayout.py:1.37
*** gnue/reports/src/GRLayout.py:1.36   Tue Jul 23 13:52:52 2002
--- gnue/reports/src/GRLayout.py        Tue Aug 27 11:53:01 2002
***************
*** 166,172 ****
  
        elif isinstance(object, GRSumm):
          if object.section == None:
!           s = object._parent.findObjectOfType('GRSection')
          else:
            sec = string.lower(object.section)
            s = self._mapper.sectionMap[sec]._object
--- 166,172 ----
  
        elif isinstance(object, GRSumm):
          if object.section == None:
!           s = object._parent.findParentOfType('GRSection')
          else:
            sec = string.lower(object.section)
            s = self._mapper.sectionMap[sec]._object
***************
*** 401,406 ****
--- 401,407 ----
      GDebug.printMesg(10,"Repeating Section %s" % self._name)
      structuralComment(dest,"<!--[section:%s]-->" % self._name)
      nextSection = self.processChildren(dest, mapper, isfirst, islast, 
firstSection, nextSection)
+     mapper.sectionMap[self.name].clearSummaries()
      structuralComment(dest,"<!--[/section:%s]-->" % self._name)
      GDebug.printMesg(10,"Leaving section %s" % self._name)
      return nextSection