Diff for /ZSQLExtend/importFMPXML.py between versions 1.21 and 1.22

version 1.21, 2008/01/09 14:43:50 version 1.22, 2008/02/04 19:06:34
Line 19  except: Line 19  except:
   
 fm_ns = 'http://www.filemaker.com/fmpxmlresult'  fm_ns = 'http://www.filemaker.com/fmpxmlresult'
   
 version_string = "V0.5.1 ROC 9.1.2008"  version_string = "V0.5.2 ROC 4.2.2008"
   
 def unicodify(text, withNone=False):  def unicodify(text, withNone=False):
     """decode str (utf-8 or latin-1 representation) into unicode object"""      """decode str (utf-8 or latin-1 representation) into unicode object"""
Line 41  def utf8ify(text, withNone=False): Line 41  def utf8ify(text, withNone=False):
         return None          return None
     if not text:      if not text:
         return ""          return ""
     if isinstance(text, str):      if isinstance(text, unicode):
         return text  
     else:  
         return text.encode('utf-8')          return text.encode('utf-8')
       else:
           return text
   
 def getTextFromNode(nodename):  def getTextFromNode(nodename):
     """get the cdata content of a node"""      """get the cdata content of a node"""

Removed from v.1.21  
changed lines
  Added in v.1.22


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>