r5292 - trunk/gnue-appserver/src/classrep

[reinhard]

Author: reinhard
Date: 2004-03-10 17:25:14 -0600 (Wed, 10 Mar 2004)
New Revision: 5292

Modified:
   trunk/gnue-appserver/src/classrep/Base.py
   trunk/gnue-appserver/src/classrep/SchemaSupport.py
Log:
More unicode fixes.


Modified: trunk/gnue-appserver/src/classrep/Base.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Base.py   2004-03-10 23:19:02 UTC (rev 
5291)
+++ trunk/gnue-appserver/src/classrep/Base.py   2004-03-10 23:25:14 UTC (rev 
5292)
@@ -22,7 +22,7 @@
 # $Id$
 
 import types
-from gnue.appserver.language import Object
+from gnue.appserver.language.Object import Object
 from Namespace import *
 
 # =============================================================================
@@ -74,13 +74,13 @@
   # Return the list of columns to be used on reload ()
   # ---------------------------------------------------------------------------
   def _getColumns (self):
-    return ['gnue_name']
+    return [u'gnue_name']
 
   # ---------------------------------------------------------------------------
   # Return the sortorder to be used on reload ()
   # ---------------------------------------------------------------------------
   def _getSortorder (self):
-    return ['gnue_id']
+    return [u'gnue_id']
 
   # ---------------------------------------------------------------------------
   # Get a condition to fetch a single item for the dictionary

Modified: trunk/gnue-appserver/src/classrep/SchemaSupport.py
===================================================================
--- trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-03-10 23:19:02 UTC 
(rev 5291)
+++ trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-03-10 23:25:14 UTC 
(rev 5292)
@@ -21,10 +21,12 @@
 #
 # $Id$
 
+from types import *
+
 import sys
-import types
 import mx.DateTime.ISO
 import re
+
 from gnue.common.schema.Objects import *
 from gnue.common.definitions.GParserHelpers import GContent
 from gnue.appserver.classrep import Namespace
@@ -259,7 +261,7 @@
   def __buildValue (self, row, prop, data):
     value = GSValue (row)
     value.field = prop.column
-    GContent (value, self.__nativeToString (data, prop.dbFullType))
+    GContent (value, self.__nativeToString (data, prop.fullType))
 
 
   # ---------------------------------------------------------------------------
@@ -290,13 +292,13 @@
     """
     _LENGTH_SCALE = re.compile ('^\w+\s*\((\d+)[\.]{0,1}(\d*)\)\s*')
 
-    if datatype [:6] == "string":
+    if datatype [:6] == "string" or datatype == "id":
       checktype (native, [NoneType, UnicodeType])
 
       if native is None:
         return u''
 
-      if isinstance (native, types.UnicodeType):
+      if isinstance (native, UnicodeType):
         return native
 
     elif datatype [:6] == "number":