gnue/reports/adapters/filters/merge_psfax Adapt...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/10/10 10:54:25

Modified files:
        reports/adapters/filters/merge_psfax: Adapter.py 

Log message:
        trying some fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/merge_psfax/Adapter.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/reports/adapters/filters/merge_psfax/Adapter.py
diff -c gnue/reports/adapters/filters/merge_psfax/Adapter.py:1.2 
gnue/reports/adapters/filters/merge_psfax/Adapter.py:1.3
*** gnue/reports/adapters/filters/merge_psfax/Adapter.py:1.2    Wed Oct  9 
21:55:06 2002
--- gnue/reports/adapters/filters/merge_psfax/Adapter.py        Thu Oct 10 
10:54:25 2002
***************
*** 28,34 ****
  
  from gnue.reports.adapters.filters._merge import MergeBase
  import string, sys, os
- from xml.sax import saxutils
  
  
  class TransformAdapter(MergeBase.TransformAdapter):
--- 28,33 ----
***************
*** 92,108 ****
  
        self.sendFax(self.__faxnum)
  
!       self.output.write(saxutils.escape(self.fieldre.sub(self.getFieldValue, 
self.repeating)))
  
        self.recordCount = self.recordCount + 1
  
  
    def sendFax(self, faxnum):
      fax_to = string.replace(string.replace(faxnum, "`",""),';','')
  
      self._tmpouthandle.close()
!     os.system(gConfig('HylafaxCommand') % (fax_to) +" "+ self._tmpoutfile)
      self._tmpouthandle = open(self._tmpoutfile,"w")
      self.output = self._tmpouthandle
  
-  
--- 91,114 ----
  
        self.sendFax(self.__faxnum)
  
!       self.output.write(self.fieldre.sub(self.getFieldValue, self.repeating))
  
        self.recordCount = self.recordCount + 1
  
  
    def sendFax(self, faxnum):
      fax_to = string.replace(string.replace(faxnum, "`",""),';','')
+     if not fax_to:
+       print "Whoa! This record didn't have a fax number... ignoring!"
+       return
  
      self._tmpouthandle.close()
!     try:
!       os.environ['GNUE_DEBUG_FAX']
!       os.system('echo ' + gConfig('HylafaxCommand') % (fax_to) +" "+ 
self._tmpoutfile)
!     except:
!       os.system(gConfig('HylafaxCommand') % (fax_to) +" "+ self._tmpoutfile)
!     ##self._tmpoutfile += '.ps'
      self._tmpouthandle = open(self._tmpoutfile,"w")
      self.output = self._tmpouthandle