gnue common/etc/sample.report-filters.conf repo...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/05/14 20:27:39

Modified files:
        common/etc     : sample.report-filters.conf 
        reports/adapters/filters/sablotron: Adapter.py 
        reports/src    : GRFilters.py 
Added files:
        reports/adapters/filters/_merge: __init__.py 
        reports/adapters/filters/merge_latex: Adapter.py __init__.py 
        reports/adapters/filters/merge_rtf: Adapter.py __init__.py 
        reports/samples/mailmerge: pg_schema.sql 

Log message:
        added merge support/examples to reports (currently, only RTF works -- 
latex does not)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/etc/sample.report-filters.conf.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/_merge/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_latex/Adapter.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_latex/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_rtf/Adapter.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_rtf/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/sablotron/Adapter.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/samples/mailmerge/pg_schema.sql?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRFilters.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnue/common/etc/sample.report-filters.conf
diff -c gnue/common/etc/sample.report-filters.conf:1.9 
gnue/common/etc/sample.report-filters.conf:1.10
*** gnue/common/etc/sample.report-filters.conf:1.9      Mon Apr 29 00:19:14 2002
--- gnue/common/etc/sample.report-filters.conf  Tue May 14 20:27:39 2002
***************
*** 3,37 ****
  #
  [mappings]
  simple = GNUe:Reports:SimpleTabulation
  #standard = GNUe:Reports:Standard
  
  
  [simple:text]
  description = Basic text without any formatting
  engine = sablotron
! script = text.xsl
  mimetype = text/plain
  
  
  [simple:html]
  description = HTML 3.0-compatable markup.
  engine = sablotron
! script = html.xsl
  mimetype = text/html
  
  
  [simple:csv]
  description = Comma Separated Values text format.
  engine = sablotron
! script = csv.xsl
  mimetype = text/comma-separated-values
  
  
! [simple:kspread]
! description = KSpread 1.1 format (KOffice spreadsheet).
! engine = sablotron
! script = kspread.xsl
! mimetype = application/x-kspread
  
  
  #
--- 3,44 ----
  #
  [mappings]
  simple = GNUe:Reports:SimpleTabulation
+ mailmerge = GNUe:Reports:MailMerge
  #standard = GNUe:Reports:Standard
  
  
  [simple:text]
  description = Basic text without any formatting
  engine = sablotron
! template = text.xsl
  mimetype = text/plain
  
  
  [simple:html]
  description = HTML 3.0-compatable markup.
  engine = sablotron
! template = html.xsl
  mimetype = text/html
  
  
  [simple:csv]
  description = Comma Separated Values text format.
  engine = sablotron
! template = csv.xsl
  mimetype = text/comma-separated-values
  
  
! # The KSpread example is not fully functional -- do not use
! #[simple:kspread]
! #description = KSpread 1.1 format (KOffice spreadsheet).
! #engine = sablotron
! #template = kspread.xsl
! #mimetype = application/x-kspread
! 
! [mailmerge:demo.rtf]
! description = My Sample RTF template
! engine = merge_rtf
! template = 
/home/jason/cvs/gnue/reports/samples/mailmerge/gnue-intro-letter.abiword.rtf
  
  
  #
Index: gnue/reports/adapters/filters/sablotron/Adapter.py
diff -c gnue/reports/adapters/filters/sablotron/Adapter.py:1.5 
gnue/reports/adapters/filters/sablotron/Adapter.py:1.6
*** gnue/reports/adapters/filters/sablotron/Adapter.py:1.5      Sat May 11 
19:52:30 2002
--- gnue/reports/adapters/filters/sablotron/Adapter.py  Tue May 14 20:27:39 2002
***************
*** 60,68 ****
  
      # Get the name of the transform script
      try:
!       xslfile = self.parameters['script']
      except KeyError:
!       raise "Filter configuration file is missing script="
  
      # Let sablotron do its thing
      PySablot.ProcessFiles(xslfile,self.infile,outfile)
--- 60,68 ----
  
      # Get the name of the transform script
      try:
!       xslfile = self.parameters['template']
      except KeyError:
!       raise "Filter configuration file is missing the 'template=' parameter"
  
      # Let sablotron do its thing
      PySablot.ProcessFiles(xslfile,self.infile,outfile)
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.11 gnue/reports/src/GRFilters.py:1.12
*** gnue/reports/src/GRFilters.py:1.11  Sat May 11 19:52:30 2002
--- gnue/reports/src/GRFilters.py       Tue May 14 20:27:39 2002
***************
*** 58,63 ****
--- 58,64 ----
      try:
        module = dyn_import ('gnue.reports.adapters.filters.%s' % 
parameters['engine'])
      except ImportError:
+       raise
        raise FilterError, "Invalid filter specified: %s" % filter
      except KeyError:
        raise FilterError, "Filter configuration file does not contain an 
'engine=' for %s" % filter
***************
*** 141,148 ****
          for option in self._parser.options(section):
            val = self._parser.get(section, option)
  
!           # If this is the script name, prepend the path
!           if option == 'script' and val[0] != '/':
              if translated[:13] == 'GNUe:Reports:':
                val = "%s/%s/%s" % (filterBase,
                         string.split(translated,':')[2],
--- 142,149 ----
          for option in self._parser.options(section):
            val = self._parser.get(section, option)
  
!           # If this is the template name, prepend the path
!           if option == 'template' and val[0] != '/':
              if translated[:13] == 'GNUe:Reports:':
                val = "%s/%s/%s" % (filterBase,
                         string.split(translated,':')[2],