[gnue] r7677 - in trunk/gnue-reports/src: base client

[btami]

Author: btami
Date: 2005-07-02 13:48:55 -0500 (Sat, 02 Jul 2005)
New Revision: 7677

Modified:
   trunk/gnue-reports/src/base/GRConfig.py
   trunk/gnue-reports/src/base/GREngine.py
   trunk/gnue-reports/src/client/GRRun.py
Log:
added missing config option supports

Modified: trunk/gnue-reports/src/base/GRConfig.py
===================================================================
--- trunk/gnue-reports/src/base/GRConfig.py     2005-07-02 18:38:49 UTC (rev 
7676)
+++ trunk/gnue-reports/src/base/GRConfig.py     2005-07-02 18:48:55 UTC (rev 
7677)
@@ -47,21 +47,21 @@
     'Comment'    : 'The default destination type if none specified on command 
line.',
     'Description': 'The default destination type if none specified on command 
line.',
     'Typecast'   :  GTypecast.text,
-    'Default'    : 'printer' },
+    'Default'    : 'file' },
 
   { 'Name'       : 'DefaultDestination',
     'Type'       : 'Setting',
     'Comment'    : 'The default destination if none specified on command 
line.',
     'Description': 'The default destination if none specified on command 
line.',
     'Typecast'   :  GTypecast.text,
-    'Default'    : 'lp' },
+    'Default'    : '-' },
 
   { 'Name'       : 'DefaultFilter',
     'Type'       : 'Setting',
     'Comment'    : 'The default filter if none specified on command line.',
     'Description': 'The default filter if none specified on command line.',
     'Typecast'   :  GTypecast.text,
-    'Default'    : 'text' },
+    'Default'    : 'raw' },
 
   { 'Name'       : 'FileAdapter',
     'Type'       : 'Setting',

Modified: trunk/gnue-reports/src/base/GREngine.py
===================================================================
--- trunk/gnue-reports/src/base/GREngine.py     2005-07-02 18:38:49 UTC (rev 
7676)
+++ trunk/gnue-reports/src/base/GREngine.py     2005-07-02 18:48:55 UTC (rev 
7677)
@@ -50,13 +50,25 @@
   # Run the report (reportFile) and generate the XML output.
   # Write the XML output to the outputHandle IOStream
   #
-  def processReport(self, reportFile, destination="-", destinationOptions="",
-                          destinationType="file", filter="text",
+  def processReport(self, reportFile,
+                          destination="",
+                          destinationOptions="",
+                          destinationType="",
+                          filter="",
                           batch=0,
-                          filterOptions="", parameters={},
-                          sortoption=None, includeStructuralComments=0,
+                          filterOptions="",
+                          parameters={},
+                          sortoption=None,
+                          includeStructuralComments=0,
                           omitGNUeXML=0):
 
+    if not destination:
+      destination = gConfigReports('DefaultDestination')
+    if not destinationType:
+      destinationType = gConfigReports('DefaultDestinationType')
+    if not filter:
+      filter = gConfigReports('DefaultFilter')
+
     self.filters = GRFilters.GRFilters()
 
     try:

Modified: trunk/gnue-reports/src/client/GRRun.py
===================================================================
--- trunk/gnue-reports/src/client/GRRun.py      2005-07-02 18:38:49 UTC (rev 
7676)
+++ trunk/gnue-reports/src/client/GRRun.py      2005-07-02 18:48:55 UTC (rev 
7677)
@@ -70,7 +70,7 @@
   #
   def __init__(self):
     self.addCommandOption ('destination', 'd', 'destination',
-        argument = 'dest', default = '-',
+        argument = 'dest',
         help = _("Where should the report be output to?  The value of this "
             "depends on the destination type (e.g., if sending to printer, "
             "then -d specifies the printer name; if sending via email, then "
@@ -81,7 +81,7 @@
             "Reports is formally released!"))
 
     self.addCommandOption ('destination_type', 'D', 'destination-type',
-        argument = 'type', default = 'file',
+        argument = 'type',
         help = _("This specifies how the report should be output. The 
currently "
             "supported values for <type> are file [default], printer, email, "
             "and fax. Note that printer, email, and fax are sent via the "
@@ -95,7 +95,7 @@
             "Example: \'--destination-options \"-o nobanner\" \'"))
 
     self.addCommandOption ('filter', 'f', 'filter',
-        argument = 'filt', default = 'raw',
+        argument = 'filt',
         help = _("Select the filter to be used to process report output.  
<filt> "
             "is the name of the filtering process as defined on the Report "
             "Server machine. If not specified, the \"raw\" filter is used "