Changeset 4814 for waeup

Timestamp:

15 Jan 2010, 11:37:03 (15 years ago)

Author:

uli

Message:

• Add converter for boolean values.

• Add methods to convert values back to strings.

• Fix choice converter (still fragile).

File:

• waeup/branches/ulif-importers/src/waeup/utils/converters.py (modified) (3 diffs)

waeup/branches/ulif-importers/src/waeup/utils/converters.py

@@ -8 +8 @@
 except ImportError:
     from zope.browser.interfaces import ITerms
-from zope.schema.interfaces import IText, IInt, IChoice
+from zope.schema.interfaces import IBool, IText, IInt, IChoice
 from waeup.interfaces import ISchemaTypeConverter
 
@@ -42 +42 @@
             self.context.validate(result)
         return result
+
+    def _convertValueToString(self, value):
+        return str(value)
+
+    def toString(self, value, strict=True):
+        if strict:
+            self.context.validate(value)
+        if value == self.context.missing_value:
+            return None
+        return self._convertValueToString(value)
+
+class BoolConverter(Converter):
+    grok.context(IBool)
+    grok.provides(ISchemaTypeConverter)
+
+    def _convertValueFromString(self, string):
+        if string is None:
+            return None
+        if string.lower() in ['1', 'true', 'yes']:
+            return True
+        return False
+
+    def _convertValueToString(self, value):
+        if value is None:
+            return None
+        if value:
+            return '1'
+        return '0'
     
 class TextConverter(Converter):
@@ -67 +95 @@
                 (self.context.source, TestRequest()), ITerms)
         except:
-            pass
+            self.terms = None
 
     def _convertValueFromString(self, string):
-        try:
-            return self.context.source.getTermByToken(string).value
-        except AttributeError:
-            self.terms = getMultiAdapter(
-                (self.context.source, TestRequest()), ITerms)
+        if self.terms is not None:
             return self.terms.getValue(string)
+        return self.context.source.getTermByToken(string).value
 
+    def _convertValueToString(self, value):
+        if self.terms is not None:
+            return self.terms.getTerm(value).token
+        return str(value)