gnue/reports samples/foobulations/monthly.grd s...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/04/09 01:00:35

Modified files:
        reports/samples/foobulations: monthly.grd 
        reports/src    : GRLayout.py GRParser.py 

Log message:
        more work on summaries

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/samples/foobulations/monthly.grd.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRLayout.py.diff?cvsroot=OldCVS&tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRParser.py.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gnue/reports/samples/foobulations/monthly.grd
diff -c gnue/reports/samples/foobulations/monthly.grd:1.9 
gnue/reports/samples/foobulations/monthly.grd:1.10
*** gnue/reports/samples/foobulations/monthly.grd:1.9   Tue Apr  9 00:48:06 2002
--- gnue/reports/samples/foobulations/monthly.grd       Tue Apr  9 01:00:34 2002
***************
*** 52,58 ****
          <out:row type="subtotal" level="1">
            <out:col>Grand Total</out:col>
            <out:col/>
!           <out:col>36</out:col>
          </out:row>
  
  
--- 52,58 ----
          <out:row type="subtotal" level="1">
            <out:col>Grand Total</out:col>
            <out:col/>
!           <out:col align="right">36</out:col>
          </out:row>
  
  
Index: gnue/reports/src/GRLayout.py
diff -c gnue/reports/src/GRLayout.py:1.24 gnue/reports/src/GRLayout.py:1.25
*** gnue/reports/src/GRLayout.py:1.24   Tue Apr  9 00:30:57 2002
--- gnue/reports/src/GRLayout.py        Tue Apr  9 01:00:35 2002
***************
*** 145,158 ****
          self._mapper.addFieldToSection(object._section, object.name)
  
        elif isinstance(object, GRSumm):
          if object.section == None:
!           s = object._parent.getAncestorWithSource(object._source)
            if s == None:
              raise SourceOutOfScope, \
                'Summary "%s" in section "%s" uses out-of-scope source "%s"' \
                     % (object.name, object._parent.name, object._source)
          else:
!           s = self._mapper.sectionMap[object.section].\
                   getAncestorWithSource(object._source)
            if s == None:
              raise SourceOutOfScope, \
--- 145,159 ----
          self._mapper.addFieldToSection(object._section, object.name)
  
        elif isinstance(object, GRSumm):
+         sec = string.lower(object.section)
          if object.section == None:
!           s = 
object._parent.findObjectOfType('GRSection').getAncestorWithSource(object._source)
            if s == None:
              raise SourceOutOfScope, \
                'Summary "%s" in section "%s" uses out-of-scope source "%s"' \
                     % (object.name, object._parent.name, object._source)
          else:
!           s = self._mapper.sectionMap[sec]._object.\
                   getAncestorWithSource(object._source)
            if s == None:
              raise SourceOutOfScope, \
***************
*** 433,438 ****
--- 434,446 ----
      self.section = None
      self.function = "count"
      self.format = None
+ 
+   def _buildObject(self):
+     if self.section:
+       self._section = string.lower(self.section)
+     else:
+       self._section = None
+     return GRLayoutElement._buildObject(self)
  
    def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
      structuralComment(dest,"<!--[summ:%s]-->" % self.name)
Index: gnue/reports/src/GRParser.py
diff -c gnue/reports/src/GRParser.py:1.20 gnue/reports/src/GRParser.py:1.21
*** gnue/reports/src/GRParser.py:1.20   Thu Apr  4 18:38:20 2002
--- gnue/reports/src/GRParser.py        Tue Apr  9 01:00:35 2002
***************
*** 214,225 ****
           'BaseClass': GRLayout.GRSumm,
           'Attributes': {
              'name':        {
-                'Required': 1,
                 'Typecast': GTypecast.name },
              'function':    {
                 'Typecast': GTypecast.name,
                 'Default': "count"},
!             'source':      {
                 'Typecast': GTypecast.name,
                 'Default': None},
              'section':     {
--- 214,224 ----
           'BaseClass': GRLayout.GRSumm,
           'Attributes': {
              'name':        {
                 'Typecast': GTypecast.name },
              'function':    {
                 'Typecast': GTypecast.name,
                 'Default': "count"},
!             'field':      {
                 'Typecast': GTypecast.name,
                 'Default': None},
              'section':     {