r6773 - trunk/gnue-appserver/src

[johannes]

Author: johannes
Date: 2004-12-01 08:03:35 -0600 (Wed, 01 Dec 2004)
New Revision: 6773

Modified:
   trunk/gnue-appserver/src/geasInstance.py
Log:
Use the proper instance as 'self' for evaluating calculated fields


Modified: trunk/gnue-appserver/src/geasInstance.py
===================================================================
--- trunk/gnue-appserver/src/geasInstance.py    2004-12-01 11:53:40 UTC (rev 
6772)
+++ trunk/gnue-appserver/src/geasInstance.py    2004-12-01 14:03:35 UTC (rev 
6773)
@@ -197,7 +197,8 @@
     #resolve indirect properties
     elements = string.split (propertyname, '.')
     classdef = self.__classdef
-    record = self.__record
+    record   = self.__record
+
     for e in elements [:-1]:
       propertydef = classdef.properties [e]
       if not propertydef.isReference:
@@ -212,7 +213,11 @@
 
     propertydef = classdef.properties [elements [-1]]
     if propertydef.isCalculated:
-      value = self.call (propertydef.procedure, None)
+      ref = self
+      if classdef.fullName != self.__classdef.fullName:
+        ref = geasInstance (self.__session, self.__connection, record, 
classdef)
+
+      value = ref.call (propertydef.procedure, None)
     else:
       value = record.getField (propertydef.column)