Changeset 1773 for pykota/trunk

Timestamp:

10/05/04 00:23:54 (20 years ago)

Author:

jalet

Message:

Charset conversions for dumps from the PostgreSQL backend

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (2 diffs)

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.52  2004/10/04 22:23:54  jalet
+# Charset conversions for dumps from the PostgreSQL backend
+#
 # Revision 1.51  2004/10/04 16:11:38  jalet
 # Now outputs page counters when dumping user groups quotas
@@ -96 +99 @@
             entries = [result.listfields()]
             entries.extend(result.getresult())
-            #nbfields = len(entries[0])
-            #for i in range(1, len(entries)) :
-            #    fields = list(entries[i])
-            #    for j in range(nbfields) :
-            #        field = fields[j]
-            #        if type(field) == StringType :
-            #            try :
-            #                fields[j] = field.decode("UTF-8").encode(self.tool.getCharset()) 
-            #            except UnicodeEncodeError : # takes care of old jobs in history not stored as UTF-8    
-            #                pass
-            #    entries[i] = tuple(fields)    
+            nbfields = len(entries[0])
+            for i in range(1, len(entries)) :
+                fields = list(entries[i])
+                for j in range(nbfields) :
+                    field = fields[j]
+                    if type(field) == StringType :
+                        try :
+                            fields[j] = field.decode("UTF-8").encode(self.tool.getCharset()) 
+                        except UnicodeEncodeError : # takes care of old jobs in history not stored as UTF-8    
+                            pass
+                entries[i] = tuple(fields)    
             return entries