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

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/05/02 15:30:19

Modified files:
        gnue-reports/src: GRParser.py GRReport.py 

Log message:
        

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/GRParser.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/GRReport.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/gnue-reports/src/GRParser.py
diff -u gnue/gnue-reports/src/GRParser.py:1.2 
gnue/gnue-reports/src/GRParser.py:1.3
--- gnue/gnue-reports/src/GRParser.py:1.2       Mon Apr 23 09:28:06 2001
+++ gnue/gnue-reports/src/GRParser.py   Wed May  2 15:30:19 2001
@@ -31,7 +31,7 @@
 
 from gnue.common.GParser import *
 from GRReport import *
-from GRQuery import *
+from GRSources import *
 from GRParameters import * 
 from GRSortOptions import *
 from GRLayout import *
@@ -58,7 +58,6 @@
 
 class xmlReportHandler (xmlHandler): 
   def __init__(self): 
-
     xmlHandler.__init__(self) 
 
     #
@@ -70,8 +69,6 @@
     #
     self.xmlElements = { 
       'report':       (GRReport,    { 'title':       (0, 0, char, None)}, 1), 
-      'query':        (GRQquery,    { 'id':          (1, 1, char, None), 
-                                      'uniqueness':  (0, 0, char, None)}, 1), 
       'parameters':   (GRParameters,{                                  }, 1), 
       'parameter':    (GRParameter, { 'id':          (1, 1, char, None), 
                                       'required':    (0, 0, bool, 0), 
@@ -93,6 +90,11 @@
       'summ':         (GRField,     { 'name':        (1, 0, char, None), 
                                       'reset':       (0, 0, char, None), 
                                       'format':      (0, 0, char, None)}, 1), 
+      'sources':      (GRSources,   {                                 }, 1), 
+      'datasource':   (GRDataSource,{ 'name':        (0, 0, char, None), 
+                                      'format':      (0, 0, char, None)}, 1), 
+#      'query':        (GRQquery,    { 'id':          (1, 1, char, None), 
+#                                      'uniqueness':  (0, 0, char, None)}, 1), 
 #      'fields':       (GRQfields,   {                                  }, 1), 
 #      'subquery':     (GRQsubquery, {                                  }, 1), 
 #      'fields':       (GRQfields,   {                                  }, 1), 
Index: gnue/gnue-reports/src/GRReport.py
diff -u gnue/gnue-reports/src/GRReport.py:1.2 
gnue/gnue-reports/src/GRReport.py:1.3
--- gnue/gnue-reports/src/GRReport.py:1.2       Mon Apr 23 09:28:06 2001
+++ gnue/gnue-reports/src/GRReport.py   Wed May  2 15:30:19 2001
@@ -41,4 +41,4 @@
 
   def dumpXML(self, treeDump=None, gap="  "):
     return GObj.dumpXML(self, GRParser.xmlReportHandler().xmlElements, 
treeDump, gap)
-
+