gnue-integrator/src GIObjects.py GIParser.py

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-integrator
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/10/08 12:50:10

Modified files:
        src            : GIObjects.py GIParser.py 

Log message:
        add small unicode fixes to integrator

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-integrator/src/GIObjects.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-integrator/src/GIParser.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue-integrator/src/GIObjects.py
diff -c gnue-integrator/src/GIObjects.py:1.9 
gnue-integrator/src/GIObjects.py:1.10
*** gnue-integrator/src/GIObjects.py:1.9        Thu Mar  6 11:10:19 2003
--- gnue-integrator/src/GIObjects.py    Wed Oct  8 12:50:09 2003
***************
*** 27,33 ****
  # NOTES:
  #
  
! import sys, string, os, os.path, re
  from gnue.common.definitions import GObjects
  from gnue.common.apps import GDebug, GConfig
  from gnue.common.datasources import GDataSource
--- 27,33 ----
  # NOTES:
  #
  
! import sys, string, os, os.path, re, types
  from gnue.common.definitions import GObjects
  from gnue.common.apps import GDebug, GConfig
  from gnue.common.datasources import GDataSource
***************
*** 106,112 ****
                              'skipThisRow':{'function':self.triggerSkipRow,
                                      'global':0}
                              }
!     
      
    def triggerSetValue(self,field,value):
      self.valuesetbytrigger[field]=value
--- 106,114 ----
                              'skipThisRow':{'function':self.triggerSkipRow,
                                      'global':0}
                              }
! 
! #    self._triggerProperties = {'extensions':{'get':self.getTriggerExtensions,
! #                                             
'set':self.setTriggerExtensions}}
      
    def triggerSetValue(self,field,value):
      self.valuesetbytrigger[field]=value
***************
*** 306,317 ****
      inpCount=1
      out=self.mergemask
      for child in self._children:
!       if child.type=="src":
!         value=str(row.getField(child.name))
          if child.trim:
            value=string.strip(value)
          out=string.replace(out,'@%s' % inpCount, '%s' % value)
          inpCount+=1
  #        print row.getField(child.name),' ',
  
      if hasattr(self,"splitre"):
--- 308,322 ----
      inpCount=1
      out=self.mergemask
      for child in self._children:
!       if child.type=="src":        
!         value=row.getField(child.name)
!         if type(value)!=types.StringType and type(value)!=types.UnicodeType:
!           value=str(value)
          if child.trim:
            value=string.strip(value)
          out=string.replace(out,'@%s' % inpCount, '%s' % value)
          inpCount+=1
+         
  #        print row.getField(child.name),' ',
  
      if hasattr(self,"splitre"):
***************
*** 340,345 ****
--- 345,352 ----
    def __init__(self, parent):
      GIObject.__init__(self, parent, type="GIField")
      self._inits = [self.initialize]
+ 
+     # TODO: add get/set procs
    
    def initialize(self):
      self._mappings = self.findParentOfType('GIMappings')
Index: gnue-integrator/src/GIParser.py
diff -c gnue-integrator/src/GIParser.py:1.7 gnue-integrator/src/GIParser.py:1.8
*** gnue-integrator/src/GIParser.py:1.7 Thu Mar  6 11:10:19 2003
--- gnue-integrator/src/GIParser.py     Wed Oct  8 12:50:10 2003
***************
*** 175,185 ****
                 'Typecast': GTypecast.name },
              'splitmask': {
  #               'Required': 1,               
!                'Typecast': GTypecast.name },
              'mergemask': {
  #               'Required': 1,
                 'Default':'@1',
!                'Typecast': GTypecast.name }},
           'ParentTags': ('process','mapping') },
           
        'field': {
--- 175,185 ----
                 'Typecast': GTypecast.name },
              'splitmask': {
  #               'Required': 1,               
!                'Typecast': GTypecast.text },
              'mergemask': {
  #               'Required': 1,
                 'Default':'@1',
!                'Typecast': GTypecast.text }},
           'ParentTags': ('process','mapping') },
           
        'field': {