gnue/reports samples/dcl/personnel-summary.grd ...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/10/20 03:07:12

Modified files:
        reports/samples/dcl: personnel-summary.grd 
        reports/src    : GRExceptions.py GRLayout.py GRParser.py 

Log message:
        fixed bug which cause static layout elements outside of a <section> to 
not print out; misc other cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/samples/dcl/personnel-summary.grd.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRExceptions.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRLayout.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRParser.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnue/reports/samples/dcl/personnel-summary.grd
diff -u gnue/reports/samples/dcl/personnel-summary.grd:1.1 
gnue/reports/samples/dcl/personnel-summary.grd:1.2
--- gnue/reports/samples/dcl/personnel-summary.grd:1.1  Mon Oct 15 00:15:51 2001
+++ gnue/reports/samples/dcl/personnel-summary.grd      Sat Oct 20 03:07:12 2001
@@ -39,6 +39,6 @@
 
     &lt;/person&gt;
     </section>
-  &lt;personnel/&gt;
+  &lt;/personnel&gt;
   </layout>
 </report>
Index: gnue/reports/src/GRExceptions.py
diff -u gnue/reports/src/GRExceptions.py:1.3 
gnue/reports/src/GRExceptions.py:1.4
--- gnue/reports/src/GRExceptions.py:1.3        Fri Oct 19 15:02:27 2001
+++ gnue/reports/src/GRExceptions.py    Sat Oct 20 03:07:12 2001
@@ -1,9 +1,9 @@
 #
 # This file is part of GNU Enterprise.
 #
-# GNU Enterprise is free software; you can redistribute it 
-# and/or modify it under the terms of the GNU General Public 
-# License as published by the Free Software Foundation; either 
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
 # version 2, or (at your option) any later version.
 #
 # GNU Enterprise is distributed in the hope that it will be 
@@ -55,11 +55,11 @@
   pass
 
 # Raised if report definition does not contain any layout directives
-class NoLayoutDefined(ReportMarkupException): 
+class NoLayoutDefined(ReportMarkupException):
   pass
 
 # Raised if report definition does not contain a <layout> section
-class NoLayoutSection(NoLayoutDefined): 
+class NoLayoutSection(NoLayoutDefined):
   pass
 
 # Raised if report definition does not contain a <sources> section
@@ -77,7 +77,7 @@
   pass
 
 # Raised if more than one section has the same name
-class SectionHasDuplicateName(ReportMarkupException): 
+class SectionHasDuplicateName(ReportMarkupException):
   pass
 
 # Raised if a field is referenced without a source 
Index: gnue/reports/src/GRLayout.py
diff -u gnue/reports/src/GRLayout.py:1.11 gnue/reports/src/GRLayout.py:1.12
--- gnue/reports/src/GRLayout.py:1.11   Mon Oct 15 00:15:51 2001
+++ gnue/reports/src/GRLayout.py        Sat Oct 20 03:07:12 2001
@@ -59,10 +59,11 @@
 
   def _buildObject(self):
     # If there is more than one object attached to a layout
-    # object, then create an unattached section to contain them.
+    # object, then create an unbound section to contain them.
+
     if len(self._children) > 1:
 
-      temp = self._children
+      temp = self._children[:]
       self._children = []
       section = GRSection(self)
       section._children = temp
@@ -100,12 +101,12 @@
 
         if object.source == None and isinstance(object, GRField):
           raise LayoutFieldHasNoSource, \
-             "Field %s in section %s does not connect to a source" \
+             'Field "%s" in section "%s" does not connect to a source' \
                  % (object.name, object.getParentOfType('GRSection').name)
 
         if object.source == None and isinstance(object, GRSumm):
           raise LayoutSummaryHasNoSource, \
-             "Summary %s in section %s does not connect to a source" \
+             'Summary "%s" in section "%s" does not connect to a source' \
                  % (object.name, object.getParentOfType('GRSection').name)
 
 
@@ -133,13 +134,13 @@
         s = object._parent.getAncestorWithSource(object.source)
         if s == None:
           raise SourceOutOfScope, \
-                "Field %s in section %s uses out-of-scope source %s" \
+                'Field "%s" in section "%s" uses out-of-scope source "%s"' \
                      % (object.name, object._parent.name, object.source)
 
         object._section = s.name
         object._mymapper = self._mapper.sectionMap[object._section]
 
-        GDebug.printMesg(6,'Mapping field %s to section %s' \
+        GDebug.printMesg(6,'Mapping field "%s" to section "%s"' \
                    % (object.name, object._section))
         self._mapper.addFieldToSection(object._section, object.name)
 
@@ -148,14 +149,14 @@
           s = object._parent.getAncestorWithSource(object.source)
           if s == None:
             raise SourceOutOfScope, \
-              "Summary %s in section %s uses out-of-scope source %s" \
+              '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, \
-              "Summary %s in section %s uses out-of-scope source %s" \
+              'Summary "%s" in section "%s" uses out-of-scope source "%s"' \
                    % (object.name, object._parent.name, object.source)
 
         object._section = s.name
@@ -175,7 +176,7 @@
 
   #
   # Process layout and dump output.
-  # self.prepare *must* have been called.
+  # self.prepare *must* be called prior to processing    .
   #
   def process(self, dest, includeStructuralComments=0):
 
Index: gnue/reports/src/GRParser.py
diff -u gnue/reports/src/GRParser.py:1.13 gnue/reports/src/GRParser.py:1.14
--- gnue/reports/src/GRParser.py:1.13   Fri Oct 19 14:35:01 2001
+++ gnue/reports/src/GRParser.py        Sat Oct 20 03:07:12 2001
@@ -144,6 +144,7 @@
          'BaseClass': GRLayout.GRLayout,
          'Required': 1,
          'SingleInstance': 1,
+         'MixedContent': 1, 
          'Attributes': {
             'format':      {
                'Typecast': GTypecast.name } },