gnue/gnue-reports src/GREngine.py src/GRParser....

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/05/23 09:20:34

Modified files:
        gnue-reports/src: GREngine.py GRParser.py GRReport.py grrun 
Added files:
        gnue-reports/samples/location: zip-by-state.grd 

Log message:
        Added my working sample.  It is a quickly developing sample, so don't 
look at it and say, 'Ooh, I think I can write a report like this.' because you 
can't!  It'll break shortly. :) Also posted miscellaneous changes to source 
code.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/samples/location/zip-by-state.grd?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/GREngine.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/GRParser.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/GRReport.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/grrun.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/gnue-reports/src/GREngine.py
diff -u gnue/gnue-reports/src/GREngine.py:1.2 
gnue/gnue-reports/src/GREngine.py:1.3
--- gnue/gnue-reports/src/GREngine.py:1.2       Thu May 17 11:59:06 2001
+++ gnue/gnue-reports/src/GREngine.py   Wed May 23 09:20:34 2001
@@ -54,6 +54,6 @@
     import sys
     report.process(sys.stdout)
 
-    print report.dumpXML(1)
+    #print report.dumpXML(1)
 
 
Index: gnue/gnue-reports/src/GRParser.py
diff -u gnue/gnue-reports/src/GRParser.py:1.4 
gnue/gnue-reports/src/GRParser.py:1.5
--- gnue/gnue-reports/src/GRParser.py:1.4       Thu May 17 11:59:06 2001
+++ gnue/gnue-reports/src/GRParser.py   Wed May 23 09:20:34 2001
@@ -88,6 +88,7 @@
       'section':      (GRSection,   { 'group':       (0, 0, char, None), 
                                       'pagebreak':   (0, 0, bool, 0)   }, 1), 
       'field':        (GRField,     { 'name':        (1, 0, char, None), 
+                                      'source':      (0, 0, char, None), 
                                       'format':      (0, 0, char, None)}, 1), 
       'summ':         (GRField,     { 'name':        (1, 0, char, None), 
                                       'reset':       (0, 0, char, None), 
@@ -139,5 +140,8 @@
 #      'min':          (GRQmin,      {                                  }, 1) 
     } 
 
-
+    #
+    # Add DataSource elements
+    #
+    self.xmlElements.update(GDataSource.xmlElements)
 
Index: gnue/gnue-reports/src/GRReport.py
diff -u gnue/gnue-reports/src/GRReport.py:1.4 
gnue/gnue-reports/src/GRReport.py:1.5
--- gnue/gnue-reports/src/GRReport.py:1.4       Thu May 17 11:59:06 2001
+++ gnue/gnue-reports/src/GRReport.py   Wed May 23 09:20:34 2001
@@ -39,23 +39,25 @@
     GObj.__init__(self, parent, type='GRReport')
     self._connections = None  # This will be set by GRParser.loadReport
 
-
   def initializeTree(self): 
     self.walk(self.buildDataSources)
     self.initialize()
 
   def buildDataSources(self, object): 
     if object.getObjectType() == "GRDataSource": 
-      GDebug.printMesg(3,"Attaching DataSource %s to %s" % (object.name, 
self._connections) )    
+      GDebug.printMesg(3,"Attaching DataSource %s to %s" \
+                         % (object.name, self._connections) )    
       object.setConnectionManager(self._connections)
 
   def initConnections(self, object): 
     if object.getObjectType() == "GRDataSource": 
-      GDebug.printMesg(3,"Connecting DataSource %s to %s" % (object.name, 
object.database) )    
+      GDebug.printMesg(3,"Connecting DataSource %s to %s" \
+                         % (object.name, object.database) )    
       object.connect()
 
   def dumpXML(self, treeDump=None, gap="  "):
-    return GObj.dumpXML(self, GRParser.xmlReportHandler().xmlElements, 
treeDump, gap)
+    return GObj.dumpXML(self, \
+        GRParser.xmlReportHandler().xmlElements, treeDump, gap)
 
   
   # 
@@ -68,4 +70,16 @@
     GDebug.printMesg(3,"Initializing DataSource Connections")
     self.walk(self.initConnections)
 
+    self._parameters = None
+    self._sources = None
+    self._layout = None
+    self._sortoptions = None
+    self.walk(self.indexObjects)
+
     dest.write ("Bob was here!\n")
+
+
+  def indexObjects(self, object): 
+    
+    # Connect 
+    self._parameters = None
Index: gnue/gnue-reports/src/grrun
diff -u gnue/gnue-reports/src/grrun:1.1 gnue/gnue-reports/src/grrun:1.2
--- gnue/gnue-reports/src/grrun:1.1     Thu May 17 11:59:06 2001
+++ gnue/gnue-reports/src/grrun Wed May 23 09:20:34 2001
@@ -45,7 +45,7 @@
   VERSION = "0.0.1"
   NAME = "GNUe Reports Client"
   COMMAND_OPTIONS = [ 
-      [ 'destination_type', 'O', 'destination_type', 1, 'printer', 'type',  
+      [ 'destination_type', 'O', 'destination-type', 1, 'printer', 'type',  
           'This specifies how the report should be output. The currently ' + \
           'supported values for <type> are printer [default], file, and 
email.' ],
       [ 'destination', 'o', 'destination', 1, 'lp', 'dest', 
@@ -53,6 +53,8 @@
           'depends on the destination type (e.g., if sending to printer, ' + \
           'then -o specifies the printer name; if sending via email, then ' + \
           '-o specifies the email address.)'], 
+      [ 'sortoption', 'S', 'sort-option', 1, '', 'sort',  
+          'Select the "sort-option" used to sort the report. '], 
       [ 'user', 'u', 'user', 1, '', 'name',  
           'Username used to log into the database.  Note that if ' + \
           'specified, this will be used for all databases.  If not ' + \