r6227 - trunk/gnue-appserver/src

[johannes]

Author: johannes
Date: 2004-08-30 04:17:25 -0500 (Mon, 30 Aug 2004)
New Revision: 6227

Modified:
   trunk/gnue-appserver/src/geasSession.py
Log:
Call OnInit() of the classes module first, and then all other module's OnInit


Modified: trunk/gnue-appserver/src/geasSession.py
===================================================================
--- trunk/gnue-appserver/src/geasSession.py     2004-08-30 07:10:04 UTC (rev 
6226)
+++ trunk/gnue-appserver/src/geasSession.py     2004-08-30 09:17:25 UTC (rev 
6227)
@@ -348,10 +348,18 @@
     instance = geasInstance.geasInstance (self, self.__connection, record,
                                           classdef)
 
+    onInits = {}
     for proc in classdef.procedures.values ():
       if proc.gnue_name.upper () == 'ONINIT':
-        instance.call (proc, None)
+        onInits [proc.module.fullName] = proc
 
+    if onInits.has_key (classdef.module.fullName):
+      instance.call (onInits [classdef.module.fullName], None)
+      del onInits [classdef.module.fullName]
+
+    for proc in onInits.values ():
+      instance.call (proc, None)
+
     return instance
 
   # ---------------------------------------------------------------------------