gnue forms/setup.py forms/src/GFObjects/GFEntry...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/05/11 19:52:30

Modified files:
        forms          : setup.py 
        forms/src/GFObjects: GFEntry.py 
        reports/adapters/filters/sablotron: Adapter.py 
        reports/src    : GRConfig.py GRFilters.py GRRun.py 

Log message:
        jamest - win32 setup fix, added default config value load to reports
        jcater - added better import error support in Sablotron driver
        - added rest of reports config options to GRConfig
        - misc bug fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/setup.py.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/sablotron/Adapter.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRConfig.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRFilters.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRRun.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnue/forms/setup.py
diff -c gnue/forms/setup.py:1.62 gnue/forms/setup.py:1.63
*** gnue/forms/setup.py:1.62    Sat Apr 27 16:59:51 2002
--- gnue/forms/setup.py Sat May 11 19:52:30 2002
***************
*** 220,230 ****
      if self.finalized:
        return
  
-     dict = self.distribution.get_option_dict("install")
- 
-     install_prefix = dict['prefix'][1]
  
      if sys.platform != 'win32':
        gnue_env = \
             "#######\n" \
           + "# The following variable were set when GNUe was installed\n" \
--- 220,230 ----
      if self.finalized:
        return
  
  
      if sys.platform != 'win32':
+       dict = self.distribution.get_option_dict("install")
+       install_prefix = dict['prefix'][1]
+ 
        gnue_env = \
             "#######\n" \
           + "# The following variable were set when GNUe was installed\n" \
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.58 
gnue/forms/src/GFObjects/GFEntry.py:1.59
*** gnue/forms/src/GFObjects/GFEntry.py:1.58    Tue May  7 21:23:37 2002
--- gnue/forms/src/GFObjects/GFEntry.py Sat May 11 19:52:30 2002
***************
*** 79,88 ****
  
  
    def triggerAutofillBySequence(self,sequenceName):
-     print "Here!"
      if (not self.getValue()) or self.getValue()=="":
        sequenceNumber = 
self._block._dataSourceLink._dataObject.triggerExtensions.getSequence(sequenceName)
-       print "Seqnum", sequenceNumber
        self.setValue(sequenceNumber)
  
  
--- 79,86 ----
Index: gnue/reports/adapters/filters/sablotron/Adapter.py
diff -c gnue/reports/adapters/filters/sablotron/Adapter.py:1.4 
gnue/reports/adapters/filters/sablotron/Adapter.py:1.5
*** gnue/reports/adapters/filters/sablotron/Adapter.py:1.4      Sun Apr 14 
16:20:43 2002
--- gnue/reports/adapters/filters/sablotron/Adapter.py  Sat May 11 19:52:30 2002
***************
*** 27,35 ****
  # NOTES:
  #
  
! import PySablot
! import Sablot
! import tempfile
  
  
  from gnue.reports.GROutputAdapter import TransformAdapter as Base
--- 27,40 ----
  # NOTES:
  #
  
! import sys, tempfile
! 
! try:
!   import PySablot
!   import Sablot
! except ImportError:
!   print "Unable to load PySablot"
!   sys.exit()
  
  
  from gnue.reports.GROutputAdapter import TransformAdapter as Base
Index: gnue/reports/src/GRConfig.py
diff -c gnue/reports/src/GRConfig.py:1.1 gnue/reports/src/GRConfig.py:1.2
*** gnue/reports/src/GRConfig.py:1.1    Sat May  4 12:45:09 2002
--- gnue/reports/src/GRConfig.py        Sat May 11 19:52:30 2002
***************
*** 1,6 ****
  #
- # Copyright 2001 Free Software Foundation
- #
  # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it
--- 1,4 ----
***************
*** 18,23 ****
--- 16,23 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
+ # Copyright 2001-2002 Free Software Foundation
+ #
  # FILE:
  # GFConfig.py
  #
***************
*** 40,46 ****
      'Comment'    : 'The default location for filter files.',
      'Description': 'The default location for filter files.',
      'Typecast'   :  GTypecast.text,
!     'Default'    : 'reports' },
  
    { 'Name'       : 'filters',
      'Type'       : 'Setting',
--- 40,46 ----
      'Comment'    : 'The default location for filter files.',
      'Description': 'The default location for filter files.',
      'Typecast'   :  GTypecast.text,
!     'Default'    : 'filters' },
  
    { 'Name'       : 'filters',
      'Type'       : 'Setting',
***************
*** 49,54 ****
--- 49,103 ----
      'Typecast'   :  GTypecast.text,
      'Default'    : 'report-filters.conf' },
  
+   { 'Name'       : 'DefaultDestinationType',
+     'Type'       : 'Setting',
+     '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' },
+ 
+   { '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' },
+ 
+   { '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' },
+ 
+   { 'Name'       : 'FileAdapter',
+     'Type'       : 'Setting',
+     'Comment'    : 'The default adapter for -D file.',
+     'Description': 'The default adapter for -D file.',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : 'text' },
+ 
+   { 'Name'       : 'EmailAdapter',
+     'Type'       : 'Setting',
+     'Comment'    : 'The default adapter for -D email.',
+     'Description': 'The default adapter for -D email.',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : 'sendmail' },
+ 
+   { 'Name'       : 'PrinterAdapter',
+     'Type'       : 'Setting',
+     'Comment'    : 'The default adapter for -D printer.',
+     'Description': 'The default adapter for -D printer.',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : 'bsd' },
+ 
+   { 'Name'       : 'FaxAdapter',
+     'Type'       : 'Setting',
+     'Comment'    : 'The default adapter for -D fax.',
+     'Description': 'The default adapter for -D fax.',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : 'hylafax' },
+ 
    { 'Name'       : 'SendmailFrom',
      'Type'       : 'Setting',
      'Comment'    : 'The email address to put in the from line of generated 
email.',
***************
*** 65,85 ****
  
    { 'Name'       : 'SendmailSubject',
      'Type'       : 'Setting',
!     'Comment'    : 'The text to put in the Subject line of generated email.'
!     'Description': 'The text to put in the Subject line of generated email.'
      'Typecast'   : GTypecast.text,
      'Default'    : 'Your Requested Report'},
  
!   { 'Name'       : 'HylafaxBin',
      'Type'       : 'Setting',
!     'Comment'    : 'Create new records in blocks automagically when you hit 
the bottom',
!     'Description': 'Create new records in blocks automagically when you hit 
the bottom.',
      'Typecast'   : GTypecast.text,
      'Default'    : 'sendfax -d %s'},
!   
    { 'Name'       : 'LprCommand',
      'Type'       : 'Setting',
!     'Comment'    : 'Create new records in blocks automagically when you hit 
the bottom',
      'Description': 'Create new records in blocks automagically when you hit 
the bottom.',
      'Typecast'   : GTypecast.text,
      'Default'    : '/usr/bin/lpr -P%s'},
--- 114,134 ----
  
    { 'Name'       : 'SendmailSubject',
      'Type'       : 'Setting',
!     'Comment'    : 'The text to put in the Subject line of generated email.',
!     'Description': 'The text to put in the Subject line of generated email.',
      'Typecast'   : GTypecast.text,
      'Default'    : 'Your Requested Report'},
  
!   { 'Name'       : 'HylafaxCommand',
      'Type'       : 'Setting',
!     'Comment'    : 'The commandline to be run when sending report output to a 
fax.',
!     'Description': 'The commandline to be run when sending report output to a 
fax.',
      'Typecast'   : GTypecast.text,
      'Default'    : 'sendfax -d %s'},
! 
    { 'Name'       : 'LprCommand',
      'Type'       : 'Setting',
!     'Comment'    : 'The commandline to be run when sending report output to a 
fax.',
      'Description': 'Create new records in blocks automagically when you hit 
the bottom.',
      'Typecast'   : GTypecast.text,
      'Default'    : '/usr/bin/lpr -P%s'},
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.10 gnue/reports/src/GRFilters.py:1.11
*** gnue/reports/src/GRFilters.py:1.10  Sat May  4 12:45:09 2002
--- gnue/reports/src/GRFilters.py       Sat May 11 19:52:30 2002
***************
*** 84,89 ****
--- 84,90 ----
          location = os.path.join(
              
GConfig.getInstalledBase('reports_etc','common_etc','install_prefix'),
              location )
+       print location
        self.readConfig(location)
  
  
Index: gnue/reports/src/GRRun.py
diff -c gnue/reports/src/GRRun.py:1.13 gnue/reports/src/GRRun.py:1.14
*** gnue/reports/src/GRRun.py:1.13      Sat May  4 12:45:09 2002
--- gnue/reports/src/GRRun.py   Sat May 11 19:52:30 2002
***************
*** 36,42 ****
  import GRExceptions
  import string, sys
  import tempfile
! 
  
  
  def quietprint(*message):
--- 36,42 ----
  import GRExceptions
  import string, sys
  import tempfile
! from gnue.reports.GRConfig import ConfigOptions
  
  
  def quietprint(*message):
***************
*** 124,130 ****
    # Initialize the class
    #
    def __init__(self):
!     GClientApp.__init__(self, application='reports')
      lh = LoginHandler()
  
      try:
--- 124,130 ----
    # Initialize the class
    #
    def __init__(self):
!     GClientApp.__init__(self, application='reports',defaults=ConfigOptions)
      lh = LoginHandler()
  
      try: