r5291 - trunk/gnue-appserver/src/language

[reinhard]

Author: reinhard
Date: 2004-03-10 17:19:02 -0600 (Wed, 10 Mar 2004)
New Revision: 5291

Modified:
   trunk/gnue-appserver/src/language/Object.py
   trunk/gnue-appserver/src/language/ObjectList.py
Log:
Changed objectId values to be unicode, because they are basically field values.


Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2004-03-10 23:13:30 UTC (rev 
5290)
+++ trunk/gnue-appserver/src/language/Object.py 2004-03-10 23:19:02 UTC (rev 
5291)
@@ -97,7 +97,7 @@
 
       res = sm.store (sid, self.__class, [self.objectId], [name],
                       [[self.__native_to_rpc (value)]])
-      self.objectId = res [0]
+      self.objectId = self.__rpc_to_native (res [0])
 
     else:
       raise AttributeError, attr
@@ -144,7 +144,7 @@
       return self.__defaultValue (datatype)
 
     # String: convert to unicode
-    elif datatype [:6] == 'string':
+    elif datatype [:6] == 'string' or datatype == 'id':
       return unicode (value, 'utf-8')
 
     # Date: convert to mx.DateTime object
@@ -159,8 +159,8 @@
     elif datatype == 'datetime':
       return mx.DateTime.ISO.ParseDateTime (value)
 
-    # id, number and boolean: no need to convert
-    elif datatype in ['id', 'boolean'] or datatype [:6] == 'number':
+    # number and boolean: no need to convert
+    elif datatype == 'boolean' or datatype [:6] == 'number':
       return value
 
     # All others (should be reference-type)

Modified: trunk/gnue-appserver/src/language/ObjectList.py
===================================================================
--- trunk/gnue-appserver/src/language/ObjectList.py     2004-03-10 23:13:30 UTC 
(rev 5290)
+++ trunk/gnue-appserver/src/language/ObjectList.py     2004-03-10 23:19:02 UTC 
(rev 5291)
@@ -95,7 +95,9 @@
 
     rset = sm.fetch (sid, self.__list_id, len (self.__list), CACHE_STEP, 0)
     for row in rset:
-      obj = Object (self.__session, self.classname, row [0])
+#     obj = Object (self.__session, self.classname, row [0])
+      # FIXME: The above line should work as soon as RPC is unicode safe
+      obj = Object (self.__session, self.classname, unicode (row [0]))
       self.__list.append (obj)
 
     # fix for gnue-common 0.5.1 release (will be removed for later releases