gnue/reports adapters/filters/_merge/MergeBase....

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/05/15 00:30:32

Modified files:
        reports/adapters/filters/_merge: MergeBase.py 
        reports/adapters/filters/merge_rtf: Adapter.py 
        reports/src    : GRLayout.py 

Log message:
        fixes to bugs surfacing from merge_rtf testing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/adapters/filters/_merge/MergeBase.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/adapters/filters/merge_rtf/Adapter.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRLayout.py.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: gnue/reports/adapters/filters/_merge/MergeBase.py
diff -c gnue/reports/adapters/filters/_merge/MergeBase.py:1.1 
gnue/reports/adapters/filters/_merge/MergeBase.py:1.2
*** gnue/reports/adapters/filters/_merge/MergeBase.py:1.1       Tue May 14 
21:03:30 2002
--- gnue/reports/adapters/filters/_merge/MergeBase.py   Wed May 15 00:30:32 2002
***************
*** 37,42 ****
--- 37,43 ----
  
    FIELD_ENCLOSURE = '::'
    NEWPAGE = "\p"
+   NEWLINE = ""
    HEAD_DELIMITER = r"^"
    TAIL_DELIMITER = r"$"
    REGEX = r"\A(.*"            \
***************
*** 100,106 ****
      self.destination.close(mimetype=mimetype)
  
      # clean up our temp files
!     #self.deleteTempFile(self.infile)
  
  
    ###
--- 101,107 ----
      self.destination.close(mimetype=mimetype)
  
      # clean up our temp files
!     self.deleteTempFile(self.infile)
  
  
    ###
***************
*** 143,148 ****
--- 144,158 ----
      self.recordCount = 1
      self.newPage = 0
  
+ ##    print '-'* 80
+ ##    print header
+ ##    print '-'* 80
+ ##    print self.repeating
+ ##    print '-'* 80
+ ##    print footer
+ ##    print '-'* 80
+ 
+ 
      output.write(header)
      self.printComment(output,
       "GNUe MailMerge [%s]:  Start of Repeating Section"%self.NAME)
***************
*** 176,182 ****
  
    def endElement(self, name):
      if name == "field":
!       self.values[string.lower(self._attrs['name'])] = self._text
      elif name == "record":
        self.printComment (self.output,
          "GNUe MailMerge [%s]:  Record #%d" % (self.NAME, self.recordCount))
--- 186,193 ----
  
    def endElement(self, name):
      if name == "field":
!       self.values[string.lower(self._attrs['name'])] = string.replace(
!             string.strip(self._text.encode('utf-8')),'\n',self.NEWLINE)
      elif name == "record":
        self.printComment (self.output,
          "GNUe MailMerge [%s]:  Record #%d" % (self.NAME, self.recordCount))
Index: gnue/reports/adapters/filters/merge_rtf/Adapter.py
diff -c gnue/reports/adapters/filters/merge_rtf/Adapter.py:1.1 
gnue/reports/adapters/filters/merge_rtf/Adapter.py:1.2
*** gnue/reports/adapters/filters/merge_rtf/Adapter.py:1.1      Tue May 14 
20:27:39 2002
--- gnue/reports/adapters/filters/merge_rtf/Adapter.py  Wed May 15 00:30:32 2002
***************
*** 1,4 ****
- #!python
  #
  # This file is part of GNU Enterprise.
  #
--- 1,3 ----
***************
*** 36,43 ****
--- 35,44 ----
  
    NAME = "RTF"
  
+ 
    # What "command" separates new records?
    NEWRECORD = "\\page\r\n"
+   NEWLINE = " "
  
    # The regex description of the beginning and end of the repeatable sections
    REGEX = r"\A(.*?)"                   \
***************
*** 53,60 ****
    def escape(self, s):
      if not len(s): return s
      part = s
!     for char in r'\{}':
!       part = string.replace(part,char,'\\' + char)
! 
      return part
  
--- 54,61 ----
    def escape(self, s):
      if not len(s): return s
      part = s
!     for char, replace in (('\\','\\\\'), ('{',r'\{'), ('}','\}'),
!                           ('\t','\\tab ')):
!       part = string.replace(part,char,replace)
      return part
  
Index: gnue/reports/src/GRLayout.py
diff -c gnue/reports/src/GRLayout.py:1.33 gnue/reports/src/GRLayout.py:1.34
*** gnue/reports/src/GRLayout.py:1.33   Sun Apr 28 21:52:53 2002
--- gnue/reports/src/GRLayout.py        Wed May 15 00:30:32 2002
***************
*** 33,38 ****
--- 33,39 ----
  from GRParameters import GRStubParam
  import GRExceptions
  import string
+ from xml.sax import saxutils
  
  
  ############################################################
***************
*** 444,450 ****
  
    def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
      structuralComment(dest,"<!--[field:%s]-->" % self.name)
!     dest.write (self._mymapper.getField(self.name, self.format))
      structuralComment(dest,"<!--[/field:%s]-->" % self.name)
      return nextSection
  
--- 445,452 ----
  
    def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
      structuralComment(dest,"<!--[field:%s]-->" % self.name)
!     dest.write (string.replace(saxutils.escape("%s" % 
self._mymapper.getField(self.name,
!                                               self.format)), '\r',''))
      structuralComment(dest,"<!--[/field:%s]-->" % self.name)
      return nextSection