Changeset 2264

Timestamp:

05/19/05 23:26:05 (19 years ago)

Author:

jerome

Message:

Improved data dumper : speed and correctness

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/dumper.py (modified) (3 diffs)
• TODO (modified) (1 diff)

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.23alpha3 :
     
+        - Data dumper improved : it's faster and now datas are correctly 
+          escaped.
+        
         - The URL to the logo displayed in the CGI scripts is configurable.
         

pykota/trunk/pykota/dumper.py

@@ -25 +25 @@
 import os
 import pwd
+from xml.sax import saxutils
+
 from mx import DateTime
 
@@ -113 +115 @@
         """Dumps datas with a separator."""
         for entry in entries :
-            line = separator.join([ '"%s"' % field for field in entry ])
+            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 :
-                self.outfile.write("%s\n" % line)
+                self.outfile.write("%s\n" % separator.join(line))
             except IOError, msg :    
                 sys.stderr.write("%s : %s\n" % (_("PyKota data dumper failed : I/O error"), msg))
@@ -165 +172 @@
             x._push()
             x.entry()
-            for i in range(len(entry)) :
-                value = str(entry[i])
-                typval = type(entry[i]).__name__
-                try :
-                    value = unicode(value, self.getCharset()).encode("UTF-8")
-                except UnicodeError :    
-                    pass
-                x.attribute(value, type=typval, name=headers[i])
+            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.getCharset()).encode("UTF-8")
+                    except UnicodeError :    
+                        pass
+                    strvalue = saxutils.escape(strvalue, { "'" : "'", \
+                                                           '"' : """ })
+                x.attribute(strvalue, type=typval, name=header)
             x._pop()    
         x._output(self.outfile)

pykota/trunk/TODO

@@ -26 +26 @@
           Winboxes it seems)
 
-        - Ensures that all special characters in strings are properly 
-          escaped when dumping datas : quotes, xml entities, etc...
-        
         - Add date filtering options to dumpykota, something like 
                 date=+20050101 date=-20050201