r6194 - trunk/gnue-appserver/src/gld

[johannes]

Author: johannes
Date: 2004-08-17 02:16:42 -0500 (Tue, 17 Aug 2004)
New Revision: 6194

Modified:
   trunk/gnue-appserver/src/gld/readgld.py
Log:
Fixed exceptions


Modified: trunk/gnue-appserver/src/gld/readgld.py
===================================================================
--- trunk/gnue-appserver/src/gld/readgld.py     2004-08-16 12:35:22 UTC (rev 
6193)
+++ trunk/gnue-appserver/src/gld/readgld.py     2004-08-17 07:16:42 UTC (rev 
6194)
@@ -50,6 +50,13 @@
     msg = u_("Class '%s' not found in class repository") % name
     Error.__init__ (self, msg)
 
+class PropertyNotFoundError (Error):
+  def __init__ (self, pName, classname):
+    msg = u_("Class '%(classname)s' has no property '%(property)s'") \
+          % {'classname': classname,
+             'property': pName}
+    Error.__init__ (self, msg)
+
 class ProcedureNotFoundError (Error):
   def __init__ (self, pName, classname):
     msg = u_("Class '%(classname)s' has no procedure '%(procedure)s'") \
@@ -299,7 +306,7 @@
       pDef ['class']   = defs ['gnue_id']
 
       if sObject._type == 'GLProperty':
-        pDef ['gnue_id']  = self.__findProperty (pDef)
+        pDef ['gnue_id']  = self.__findProperty (pDef, sObject._parent)
         pDef ['relation'] = 'gnue_property'
       else:
         pDef ['gnue_id'] = self.__findProcedure (pDef, sObject._parent)
@@ -343,13 +350,13 @@
   # Find a property by name, module- and class-id
   # ---------------------------------------------------------------------------
 
-  def __findProperty (self, pDef):
+  def __findProperty (self, pDef, parent):
     mc = GConditions.buildConditionFromDict ({'gnue_module': pDef ['module'],
                                               'gnue_class': pDef ['class'],
                                               'gnue_name': pDef ['name']})
     rs = self._dtsProperty.createResultSet (mc)
     if rs.firstRecord () is None:
-      raise ModuleNotFoundError, (module)
+      raise PropertyNotFoundError, (pDef ['name'], parent.fullName)
     return rs.current.getField ('gnue_id')