r6824 - trunk/gnue-appserver/src/language

[johannes]

Author: johannes
Date: 2004-12-25 08:05:44 -0600 (Sat, 25 Dec 2004)
New Revision: 6824

Modified:
   trunk/gnue-appserver/src/language/Session.py
Log:
Don't miss extended properties and procedures 


Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py        2004-12-25 13:57:11 UTC 
(rev 6823)
+++ trunk/gnue-appserver/src/language/Session.py        2004-12-25 14:05:44 UTC 
(rev 6824)
@@ -205,17 +205,21 @@
       moduleId = self.__findModule (module)
       classId  = self.__findClass (moduleId, name)
 
-      result ['properties'] = self.__fetchData ('property' , moduleId, classId)
-      result ['procedures'] = self.__fetchData ('procedure', moduleId, classId)
+      result ['properties'] = self.__fetchData ('property' , classId)
+      result ['procedures'] = self.__fetchData ('procedure', classId)
 
     return result
 
 
-  def __fetchData (self, tablename, moduleId, classId):
+  # ---------------------------------------------------------------------------
+  # Load data from a table for a given class
+  # ---------------------------------------------------------------------------
 
+  def __fetchData (self, tablename, classId):
+
     result = []
     listId = self.__sm.request (self.__session_id, "gnue_%s" % tablename,
-                    {'gnue_module': moduleId, 'gnue_class': classId},
+                    {'gnue_class': classId},
                     [], ['gnue_name', 'gnue_module'])
 
     while True:
@@ -230,6 +234,11 @@
 
     return result
 
+
+  # ---------------------------------------------------------------------------
+  # Find the gnue_id of a given module
+  # ---------------------------------------------------------------------------
+
   def __findModule (self, moduleName):
 
     for (gnueId, name) in self.__modules.items ():
@@ -247,6 +256,11 @@
 
     return key
 
+
+  # ---------------------------------------------------------------------------
+  # Find the name of a module by it's gnue_id
+  # ---------------------------------------------------------------------------
+
   def __moduleName (self, moduleId):
 
     if self.__modules.has_key (moduleId):
@@ -254,13 +268,17 @@
 
     lid = self.__sm.request (self.__session_id, 'gnue_module',
         {'gnue_id': moduleId}, [], ['gnue_name'])
-    res = self.__sm.feth (self.__session_id, lid, 0, 10, 0)
+    res = self.__sm.fetch (self.__session_id, lid, 0, 10, 0)
     if res:
       self.__modules [moduleId] = res [0][1]
 
     return self.__modules.get (moduleId)
 
 
+  # ---------------------------------------------------------------------------
+  # Find the gnue_id of a given class
+  # ---------------------------------------------------------------------------
+
   def __findClass (self, moduleId, classname):
 
     lid = self.__sm.request (self.__session_id, 'gnue_class',