r5386 - trunk/gnue-appserver/src

[reinhard]

Author: reinhard
Date: 2004-03-19 15:02:07 -0600 (Fri, 19 Mar 2004)
New Revision: 5386

Modified:
   trunk/gnue-appserver/src/geasInstance.py
Log:
Yet more fixes for exceptions.


Modified: trunk/gnue-appserver/src/geasInstance.py
===================================================================
--- trunk/gnue-appserver/src/geasInstance.py    2004-03-19 20:11:39 UTC (rev 
5385)
+++ trunk/gnue-appserver/src/geasInstance.py    2004-03-19 21:02:07 UTC (rev 
5386)
@@ -66,7 +66,7 @@
   # Convert a value into the give type if possible
   # ---------------------------------------------------------------------------
 
-  def __convert (self, value, propertydef):
+  def __convert (self, value, propertydef, exception):
 
     if value is None:
       # "None" is always valid, independent of data type
@@ -77,7 +77,7 @@
       if isinstance (value, types.UnicodeType):
         return value
       else:
-        raise DbValueError (propertydef.fullName, value)
+        raise exception (propertydef.fullName, value)
 
     elif propertydef.dbType == "number":
       # Number property: Must be something that can be converted to an int or
@@ -90,7 +90,7 @@
           # ... with fractional part
           return float (value)
       except ValueError:
-        raise DbValueError (propertydef.fullName, value)
+        raise exception (propertydef.fullName, value)
       
     elif propertydef.dbType == "date":
       # Date property: Must be an mx.DateTime or at least parseable as such
@@ -104,7 +104,7 @@
         return mx.DateTime.DateTime (value.year, value.month, value.day,
                                      0, 0, 0)
       else:
-        raise DbValueError (propertydef.fullName, value)
+        raise exception (propertydef.fullName, value)
 
     elif propertydef.dbType == "time":
       # Time property: Must be an mx.DateTime or at least parseable as such
@@ -119,7 +119,7 @@
         return mx.DateTime.DateTime (1, 1, 1,
                                      value.hour, value.minute, value.second)
       else:
-        raise DbValueError (propertydef.fullName, value)
+        raise exception (propertydef.fullName, value)
 
     elif propertydef.dbType == "datetime":
       # Date/Time property: Must be an mx.DateTime or at least parseable as
@@ -132,7 +132,7 @@
       if isinstance (value, mx.DateTime.DateTimeType):
         return value
       else:
-        raise DbValueError (propertydef.fullName, value)
+        raise exception (propertydef.fullName, value)
 
     elif propertydef.dbType == "boolean":
       # Boolean property: Must be something meaningful
@@ -143,14 +143,14 @@
                      True]:
         return True
       else:
-        raise DbValueError (propertydef.fullName, value)
+        raise exception (propertydef.fullName, value)
 
     else:
       # Unknown property type
-      raise DbValueError (propertydef.fullName, value)
+      raise exception (propertydef.fullName, value)
 
   # ---------------------------------------------------------------------------
-  # Get the value of a property and convert it into RPC-transportable datatype
+  # Get the value of a property
   # ---------------------------------------------------------------------------
 
   def __getValue (self, propertyname):
@@ -159,7 +159,7 @@
 
     value = self.__record.getField (propertydef.column)
 
-    return self.__convert (value, propertydef)
+    return self.__convert (value, propertydef, DbValueError)
 
   # ---------------------------------------------------------------------------
   # Get the values of a list of properties
@@ -173,14 +173,14 @@
     return result
 
   # ---------------------------------------------------------------------------
-  # Set the value of a property and convert it into native datatype
+  # Set the value of a property
   # ---------------------------------------------------------------------------
 
   def __putValue (self, propertyname, value):
 
     propertydef = self.__classdef.properties [propertyname]
 
-    __value = self.__convert (value, propertydef)
+    __value = self.__convert (value, propertydef, PropertyValueError)
 
     self.__record.putField (propertydef.column, __value)