gnue common/etc/sample.gnue.conf common/etc/sam...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/10/08 17:50:42

Modified files:
        common/etc     : sample.gnue.conf sample.report-filters.conf 
        reports/adapters/destinations/fax: hylafax.py 
        reports/adapters/filters/_merge: MergeBase.py 
        reports/src    : GREngine.py 
Added files:
        reports/adapters/filters/merge_psfax: Adapter.py __init__.py 

Log message:
        added psfax merge support

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/etc/sample.gnue.conf.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/etc/sample.report-filters.conf.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/destinations/fax/hylafax.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/_merge/MergeBase.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_psfax/Adapter.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_psfax/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GREngine.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnue/common/etc/sample.gnue.conf
diff -c gnue/common/etc/sample.gnue.conf:1.36 
gnue/common/etc/sample.gnue.conf:1.37
*** gnue/common/etc/sample.gnue.conf:1.36       Wed Sep 25 16:20:09 2002
--- gnue/common/etc/sample.gnue.conf    Tue Oct  8 17:50:42 2002
***************
*** 248,254 ****
  #SendmailSubject = Your Requested Report
  
  # HylaFax sendfax binary (for FaxAdapter = hylafax)
! #HylaFaxCommand = /usr/bin/sendfax -m -d %s
  # HylaFaxCommand = /usr/bin/sendfax -n -h faxserver.mydomain.com -d %s
  
  
--- 248,254 ----
  #SendmailSubject = Your Requested Report
  
  # HylaFax sendfax binary (for FaxAdapter = hylafax)
! HylafaxCommand = echo /usr/bin/sendfax -m -d %s
  # HylaFaxCommand = /usr/bin/sendfax -n -h faxserver.mydomain.com -d %s
  
  
Index: gnue/common/etc/sample.report-filters.conf
diff -c gnue/common/etc/sample.report-filters.conf:1.14 
gnue/common/etc/sample.report-filters.conf:1.15
*** gnue/common/etc/sample.report-filters.conf:1.14     Tue Oct  8 13:30:44 2002
--- gnue/common/etc/sample.report-filters.conf  Tue Oct  8 17:50:42 2002
***************
*** 60,66 ****
  
  [mailmerge:auth.ps]
  description = Direct Mail Authorizations (PS)
! engine = merge_ps
  template = /home/jason/h/tmp/auth.ps
  
  [mailmerge:amc8fax]
--- 60,66 ----
  
  [mailmerge:auth.ps]
  description = Direct Mail Authorizations (PS)
! engine = merge_psfax
  template = /home/jason/h/tmp/auth.ps
  
  [mailmerge:amc8fax]
Index: gnue/reports/adapters/destinations/fax/hylafax.py
diff -c gnue/reports/adapters/destinations/fax/hylafax.py:1.4 
gnue/reports/adapters/destinations/fax/hylafax.py:1.5
*** gnue/reports/adapters/destinations/fax/hylafax.py:1.4       Sat May  4 
12:45:09 2002
--- gnue/reports/adapters/destinations/fax/hylafax.py   Tue Oct  8 17:50:42 2002
***************
*** 69,75 ****
  
      fax_to = string.replace(string.replace(self.destination, "`",""),';','')
  
!     os.system(gConfig('HylafaxBin')+" " % (fax_to) + file)
      self.deleteTempFile(self.tempfile)
  
  
--- 69,75 ----
  
      fax_to = string.replace(string.replace(self.destination, "`",""),';','')
  
!     os.system('echo ' + gConfig('HylafaxCommand')% (fax_to) +" "  + file)
      self.deleteTempFile(self.tempfile)
  
  
Index: gnue/reports/adapters/filters/_merge/MergeBase.py
diff -c gnue/reports/adapters/filters/_merge/MergeBase.py:1.2 
gnue/reports/adapters/filters/_merge/MergeBase.py:1.3
*** gnue/reports/adapters/filters/_merge/MergeBase.py:1.2       Wed May 15 
00:30:32 2002
--- gnue/reports/adapters/filters/_merge/MergeBase.py   Tue Oct  8 17:50:42 2002
***************
*** 55,60 ****
--- 55,62 ----
      Base.__init__(self, *args, **params)
      self.fieldre = re.compile("%s(\\w+)%s" % \
            (self.FIELD_ENCLOSURE, self.FIELD_ENCLOSURE))
+     self.recordCount = 1
+     self.newPage = 0
  
    ###
    ### Methods for TransformAdapter support
***************
*** 141,148 ****
  
      header, self.repeating, footer = reg.groups()
      self.output = output
-     self.recordCount = 1
-     self.newPage = 0
  
  ##    print '-'* 80
  ##    print header
--- 143,148 ----
Index: gnue/reports/src/GREngine.py
diff -c gnue/reports/src/GREngine.py:1.16 gnue/reports/src/GREngine.py:1.17
*** gnue/reports/src/GREngine.py:1.16   Tue Sep 17 11:27:45 2002
--- gnue/reports/src/GREngine.py        Tue Oct  8 17:50:42 2002
***************
*** 65,71 ****
      except IOError, msg:
        raise GRExceptions.ReportUnreadable, \
           "Unable to read the requested report definition\n  (%s)\n\n" % 
reportFile \
!          + "Additional Information:\n  %s" % msgi
  
  
      #
--- 65,71 ----
      except IOError, msg:
        raise GRExceptions.ReportUnreadable, \
           "Unable to read the requested report definition\n  (%s)\n\n" % 
reportFile \
!          + "Additional Information:\n  %s" % msg
  
  
      #