gnue/reports/src GRDataMapper.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/04/09 21:40:15

Modified files:
        reports/src    : GRDataMapper.py 

Log message:
        synching machines

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRDataMapper.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/reports/src/GRDataMapper.py
diff -c gnue/reports/src/GRDataMapper.py:1.12 
gnue/reports/src/GRDataMapper.py:1.13
*** gnue/reports/src/GRDataMapper.py:1.12       Tue Apr  9 18:55:41 2002
--- gnue/reports/src/GRDataMapper.py    Tue Apr  9 21:40:15 2002
***************
*** 146,152 ****
    #
    #
    #
!   def clearSummaries(self):
      print "clearing summaries for %s" % self.name
      print self.summaries
      for field in self.summaries.keys():
--- 146,152 ----
    #
    #
    #
!   def _clearSummaries(self):
      print "clearing summaries for %s" % self.name
      print self.summaries
      for field in self.summaries.keys():
***************
*** 158,164 ****
    #  Save current values before new query occurs
    #
    def _loadFields(self, recordset, reset=0):
!     if reset: self.clearSummaries()
      self.changed = 0
      for field in self.fields.keys():
        val = recordset.getField(field)
--- 158,164 ----
    #  Save current values before new query occurs
    #
    def _loadFields(self, recordset, reset=0):
!     if reset: self._clearSummaries()
      self.changed = 0
      for field in self.fields.keys():
        val = recordset.getField(field)
***************
*** 185,194 ****
    def _handleSummary(self):
      # Now, calc all summaries
      for field in self.summaries.keys():
- ##    if self.summaries.has_key(field):
        for function in _summFunctions:
          if self.summaries[field].has_key(function):
!           self._summMap[function](field, self.fields[field])
  
    #
    # Will the next recordset cause
--- 185,196 ----
    def _handleSummary(self):
      # Now, calc all summaries
      for field in self.summaries.keys():
        for function in _summFunctions:
          if self.summaries[field].has_key(function):
!           try:
!             self._summMap[function](field, self.fields[field])
!           except KeyError:
!             pass
  
    #
    # Will the next recordset cause
***************
*** 393,399 ****
            nextSection = s.name
  
          if nextSection and nextSection != s._lastSection:
!           s._clearSummary()
          s._handleSummary()
  
        s._lastSection = firstSection
--- 395,401 ----
            nextSection = s.name
  
          if nextSection and nextSection != s._lastSection:
!           s._clearSummaries()
          s._handleSummary()
  
        s._lastSection = firstSection