Changeset 47426

Timestamp:

07/25/06 17:38:36 (2 years ago)

Author:

fguillaume

Message:

ELHGED-115: need to deal with unicode values in SQL.
We encode them into utf-8.

Files:

• CPS4/products/CPSDirectory/trunk/SQLDirectory.py (modified) (4 diffs)

CPS4/products/CPSDirectory/trunk/SQLDirectory.py

@@ -130 +130 @@
-    def getSQLValue(self, value, quoter=None):
-        """Get a quoted SQL value."""
-
-
+
-            if quoter is None:
-                quoter = self._getSQLQuoter()
+            if isinstance(value, str):
+                value = unicode(value, 'latin-1')
+            value = value.encode('utf-8')
-            return quoter(value)
-        elif isinstance(value, (int, long, float)):
@@ -145 +147 @@
-            logger.debug("getSQLValue: Unknown conversion for %r", value)
-            raise ValueError(value)
+
+    security.declarePrivate('valueFromSQL')
+    def valueFromSQL(self, value):
+        """Get a python value from a SQL one.
+        """
+        if isinstance(value, str):
+            v = unicode(value, 'utf-8')
+            try:
+                v.encode('ascii')
+            except UnicodeEncodeError:
+                # If we don't have ascii, keep the unicode value
+                value = v
+        return value
-
-    security.declarePublic('debugTest') # XXX
@@ -269 +284 @@
-                entry = {}
-                for field_id in field_ids:
-entry[field_id]
-# XXX conversions !
+value
+entry[field_id] = self.valueFromSQL(value)
-                res.append((id, entry))
-
@@ -396 +411 @@
-        entry = {}
-        for field_id in field_ids:
-entry[field_id]
-# XXX conversions !
+value
+entry[field_id] = self.valueFromSQL(value)
-        return entry
-