[gnue] r8100 - in trunk: gnue-designer/src/reports gnue-designer/src/reports/Char gnue-reports/samples/foobulations gnue-reports/src/adapters/filters/Char/char gnue-reports/src/adapters/filters/Char/char/CHObjects gnue-reports/src/base

[btami]

Author: btami
Date: 2005-11-17 16:18:53 -0600 (Thu, 17 Nov 2005)
New Revision: 8100

Modified:
   trunk/gnue-designer/src/reports/Char/Incubator.py
   trunk/gnue-designer/src/reports/Incubator.py
   trunk/gnue-designer/src/reports/Instance.py
   trunk/gnue-reports/samples/foobulations/monthly.grd
   trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py
   trunk/gnue-reports/src/base/GRSources.py
Log:
little work on designer's report support

Modified: trunk/gnue-designer/src/reports/Char/Incubator.py
===================================================================
--- trunk/gnue-designer/src/reports/Char/Incubator.py   2005-11-17 22:17:03 UTC 
(rev 8099)
+++ trunk/gnue-designer/src/reports/Char/Incubator.py   2005-11-17 22:18:53 UTC 
(rev 8100)
@@ -19,7 +19,7 @@
 # Copyright 2001-2005 Free Software Foundation
 #
 # FILE:
-# reports/Incubator.py
+# reports/Char/Incubator.py
 #
 # DESCRIPTION:
 # Creates objects to be added to the object
@@ -27,14 +27,13 @@
 # NOTES:
 #
 
-from gnue.common.apps import GDebug
-from gnue.common.definitions import GParserHelpers
 from gnue.common.utils.FileUtils import dyn_import
-from gnue.reports.base import GRParser, GRReport
-from gnue.designer.base.Incubator import BaseIncubator
+from gnue.reports.base import GRParser
+from gnue.designer.reports.Incubator import Incubator as BaseReportIncubator
 
-class Incubator(BaseIncubator):
 
+class Incubator(BaseReportIncubator):
+
   elements = GRParser.getXMLelements()
   layoutParser = dyn_import('gnue.reports.adapters.filters.Char.LayoutParser')
   elements.update(layoutParser.getXMLelements())

Modified: trunk/gnue-designer/src/reports/Incubator.py
===================================================================
--- trunk/gnue-designer/src/reports/Incubator.py        2005-11-17 22:17:03 UTC 
(rev 8099)
+++ trunk/gnue-designer/src/reports/Incubator.py        2005-11-17 22:18:53 UTC 
(rev 8100)
@@ -59,7 +59,16 @@
     except KeyError:
       name = tag[tag.find(':')+1:]
 
-    objclass = GRLayout.GRPassThru
+    xmltag = tag[tag.find(':')+1:]
+    try:
+      objclass = self.elements[xmltag]['BaseClass']
+      if self.elements[xmltag].has_key('Attributes'):
+        attrs = self.elements[xmltag]['Attributes']
+      else:
+        attrs = {}
+    except KeyError:
+      objclass = GRLayout.GRPassThru
+
     o = objclass(parent)
 
     # Add any GContent
@@ -69,7 +78,7 @@
       pass
 
     o.__dict__.update(attributes)
-    o._xmltag = tag[tag.find(':')+1:]
+    o._xmltag = xmltag
     o._listedAttributes = attributes.keys()
     o._xmlnamespace = rootObject.findChildOfType('GRLayout')._xmlchildnamespace
 

Modified: trunk/gnue-designer/src/reports/Instance.py
===================================================================
--- trunk/gnue-designer/src/reports/Instance.py 2005-11-17 22:17:03 UTC (rev 
8099)
+++ trunk/gnue-designer/src/reports/Instance.py 2005-11-17 22:18:53 UTC (rev 
8100)
@@ -82,7 +82,7 @@
       usingDefault = 1
 
     self.filter = filtersupport.FilterSupport(self, report)
-    print self.filter
+
     if usingDefault:
       self.filter.setNamespace(namespace)
 
@@ -113,7 +113,6 @@
       usingDefault = 1
 
     self.filter = filtersupport.FilterSupport(self, report)
-    print self.filter
 
     if usingDefault:
       self.filter.setNamespace(namespace)

Modified: trunk/gnue-reports/samples/foobulations/monthly.grd
===================================================================
--- trunk/gnue-reports/samples/foobulations/monthly.grd 2005-11-17 22:17:03 UTC 
(rev 8099)
+++ trunk/gnue-reports/samples/foobulations/monthly.grd 2005-11-17 22:18:53 UTC 
(rev 8100)
@@ -48,15 +48,15 @@
            <trigger name="foo1" type="pre-section">
              print "entering nameBreak"
            </trigger>
-           <trigger name="foo1" type="post-section">
+           <trigger name="foo2" type="post-section">
              print "exiting nameBreak"
            </trigger>
            <section name="details">
-             <trigger name="foo1" type="pre-section">
+             <trigger name="foo3" type="pre-section">
                print "entering details"
                print "name=",nameBreak.name
              </trigger>
-             <trigger name="foo1" type="post-section">
+             <trigger name="foo4" type="post-section">
                print "exiting details"
              </trigger>
              <trigger name="bar" type="on-process">

Modified: 
trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py     
2005-11-17 22:17:03 UTC (rev 8099)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHObjects/CHObject.py     
2005-11-17 22:18:53 UTC (rev 8100)
@@ -30,6 +30,7 @@
 
 __all__ = ['CHObject', 'CHBand']
 
+from gnue.common.definitions.GObjects import GObj
 from gnue.reports.base.layout.GRPassThru import GRPassThru
 
 
@@ -37,7 +38,10 @@
   def __init__(self, parent=None, type='CHObject'):
     GRPassThru.__init__(self, parent, type=type)
 
+  def getXmlTag(self, stripPrefixes=None):
+    return GObj.getXmlTag(self)
 
+
 class CHBand:
   splittable = False # This band is not splittable across pages
   def __init__(self):

Modified: trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py       
2005-11-17 22:17:03 UTC (rev 8099)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py       
2005-11-17 22:18:53 UTC (rev 8100)
@@ -63,4 +63,4 @@
     writer.newPage()
 
   def getXmlTag(self, stripPrefixes=None):
-    return self._xmltag
+    return 'chreport'

Modified: trunk/gnue-reports/src/base/GRSources.py
===================================================================
--- trunk/gnue-reports/src/base/GRSources.py    2005-11-17 22:17:03 UTC (rev 
8099)
+++ trunk/gnue-reports/src/base/GRSources.py    2005-11-17 22:18:53 UTC (rev 
8100)
@@ -53,7 +53,7 @@
 
 
   def getDataSource(self, source):
-    return self.getParent ()._datasourceDictionary[string.lower(source)]
+    return self.getParent ()._datasourceDictionary[source.lower()]
 
 
 class GRDataSource (GDataSource.GDataSource):