gnue/reports setup.py src/GRConfig.py src/GROut...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/13 12:00:24

Modified files:
        reports        : setup.py 
        reports/src    : GRConfig.py GROutputAdapter.py 
        reports/src/adapters/destinations/printer: bsd.py 
        reports/src/adapters/filters/labels/formatters: postscript.py 

Log message:
        updated setup.py for labels

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/setup.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRConfig.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GROutputAdapter.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/destinations/printer/bsd.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/labels/formatters/postscript.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.16 gnue/reports/setup.py:1.17
*** gnue/reports/setup.py:1.16  Tue Nov 12 13:35:49 2002
--- gnue/reports/setup.py       Wed Nov 13 12:00:23 2002
***************
*** 245,251 ****
                     "gnue.reports.adapters.filters.sablotron",
                     "gnue.reports.adapters.filters.4xslt",
                     "gnue.reports.adapters.filters.raw",
!                    "gnue.reports.adapters.filters._labels",
                     "gnue.reports.adapters.filters._merge",
                     "gnue.reports.adapters.filters.merge_latex",
                     "gnue.reports.adapters.filters.merge_rtf",
--- 245,252 ----
                     "gnue.reports.adapters.filters.sablotron",
                     "gnue.reports.adapters.filters.4xslt",
                     "gnue.reports.adapters.filters.raw",
!                    "gnue.reports.adapters.filters.labels",
!                    "gnue.reports.adapters.filters.labels.formatters",
                     "gnue.reports.adapters.filters._merge",
                     "gnue.reports.adapters.filters.merge_latex",
                     "gnue.reports.adapters.filters.merge_rtf",
Index: gnue/reports/src/GRConfig.py
diff -c gnue/reports/src/GRConfig.py:1.2 gnue/reports/src/GRConfig.py:1.3
*** gnue/reports/src/GRConfig.py:1.2    Sat May 11 19:52:30 2002
--- gnue/reports/src/GRConfig.py        Wed Nov 13 12:00:23 2002
***************
*** 131,135 ****
      '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'},
  )
--- 131,135 ----
      '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 -h -P%s'},
  )
Index: gnue/reports/src/GROutputAdapter.py
diff -c gnue/reports/src/GROutputAdapter.py:1.4 
gnue/reports/src/GROutputAdapter.py:1.5
*** gnue/reports/src/GROutputAdapter.py:1.4     Sat May  4 12:45:09 2002
--- gnue/reports/src/GROutputAdapter.py Wed Nov 13 12:00:23 2002
***************
*** 67,73 ****
    def __init__(self, destination, parameters = {}, filter_options=""):
      self.destination = destination
      self.output = destination.getOutputHandle()
!     self.options= filter_options
      self.parameters = parameters
  
  
--- 67,73 ----
    def __init__(self, destination, parameters = {}, filter_options=""):
      self.destination = destination
      self.output = destination.getOutputHandle()
!     self.filter_options= filter_options
      self.parameters = parameters
  
  
Index: gnue/reports/src/adapters/destinations/printer/bsd.py
diff -c gnue/reports/src/adapters/destinations/printer/bsd.py:1.3 
gnue/reports/src/adapters/destinations/printer/bsd.py:1.4
*** gnue/reports/src/adapters/destinations/printer/bsd.py:1.3   Sat May  4 
12:45:09 2002
--- gnue/reports/src/adapters/destinations/printer/bsd.py       Wed Nov 13 
12:00:24 2002
***************
*** 30,35 ****
--- 30,36 ----
  
  from gnue.reports import VERSION
  from gnue.reports.GROutputAdapter import DestinationAdapter as Base
+ from gnue.common import GDebug
  import sys, os, string
  
  
***************
*** 69,74 ****
  
      print_to = string.replace(string.replace(self.destination, "`",""),';','')
  
!     os.system((gConfig('LprCommand') + " %s") % (print_to, file))
      self.deleteTempFile(self.tempfile)
  
--- 70,77 ----
  
      print_to = string.replace(string.replace(self.destination, "`",""),';','')
  
!     command = (gConfig('LprCommand') + " %s") % (print_to, file)
!     GDebug.printMesg(3,'Printing using command: %s' % command)
!     os.system(command)
      self.deleteTempFile(self.tempfile)
  
Index: gnue/reports/src/adapters/filters/labels/formatters/postscript.py
diff -c gnue/reports/src/adapters/filters/labels/formatters/postscript.py:1.2 
gnue/reports/src/adapters/filters/labels/formatters/postscript.py:1.3
*** gnue/reports/src/adapters/filters/labels/formatters/postscript.py:1.2       
Wed Nov 13 01:21:17 2002
--- gnue/reports/src/adapters/filters/labels/formatters/postscript.py   Wed Nov 
13 12:00:24 2002
***************
*** 96,101 ****
--- 96,102 ----
  
      if self._row > self._specrow:
        self._row = 1
+       self.EndPage()
        self.BeginPage()
  
      self._lines = []