Changeset 3291 for pykota/trunk/pykota/dumper.py

Timestamp:

01/13/08 01:22:35 (16 years ago)

Author:

jerome

Message:

Database backends now convert from and to unicode instead of UTF-8.
The data dumper now expects unicode datas from the database.

Files:

• pykota/trunk/pykota/dumper.py (modified) (2 diffs)

pykota/trunk/pykota/dumper.py

@@ -244 +244 @@
                 line = []
                 for value in entry :
-                    if type(value).__name__ in ("str", "NoneType") :
-                        line.append('"%s"' % str(value).replace(separator, "\\%s" % separator).replace('"', '\\"'))
-                    else :    
-                        line.append(str(value))
+                    try :
+                        strvalue = '"%s"' % value.encode(self.charset, \
+                                                         "replace").replace(separator, "\\%s" % separator).replace('"', '\\"')
+                    except AttributeError :
+                        if value is None :
+                            strvalue = '"None"' # Double quotes around None to prevent spreadsheet from failing
+                        else :    
+                            strvalue = str(value)
+                    line.append(strvalue)
                 try :
                     self.outfile.write("%s\n" % separator.join(line))
@@ -313 +318 @@
                 x.entry()
                 for (header, value) in zip(headers, entry) :
-                    strvalue = str(value)
-                    typval = type(value).__name__
-                    if header in ("filename", "title", "options", "billingcode") \
-                              and (typval == "str") :
-                        try :
-                            strvalue = unicode(strvalue, self.charset).encode("UTF-8")
-                        except UnicodeError :    
-                            pass
-                        strvalue = saxutils.escape(strvalue, { "'" : "'", \
-                                                               '"' : """ })
-                    x.attribute(strvalue, type=typval, name=header)
+                    try :
+                        strvalue = saxutils.escape(value.encode("UTF-8", \
+                                                                "replace"), \
+                                                   { "'" : "'", \
+                                                     '"' : """ })
+                    except AttributeError :    
+                        strvalue = str(value)
+                    # We use 'str' instead of 'unicode' below to be compatible
+                    # with older releases of PyKota.
+                    # The XML dump will contain UTF-8 encoded strings, 
+                    #�not unicode strings anyway.
+                    x.attribute(strvalue, \
+                                type=type(value).__name__.replace("unicode", "str"), \
+                                name=header)
                 x._pop()    
             x._pop()