r6553 - trunk/gnue-forms/src/GFObjects

[johannes]

Author: johannes
Date: 2004-10-23 09:37:44 -0500 (Sat, 23 Oct 2004)
New Revision: 6553

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Added better exceptions


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-10-23 13:40:59 UTC (rev 
6552)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2004-10-23 14:37:44 UTC (rev 
6553)
@@ -222,7 +222,12 @@
       ds._buildObject()
       ds.phaseInit()
 
-    self._dataSourceLink = form._datasourceDictionary[self.datasource]
+    self._dataSourceLink = form._datasourceDictionary.get (self.datasource)
+    if self._dataSourceLink is None:
+      raise errors.ApplicationError, \
+          u_("Datasource '%(datasource)s' in block '%(block)s' not found") \
+          % {'datasource': self.datasource,
+             'block': self.name}
 
     # Get min and max child rows, if applicable
     try:

Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2004-10-23 13:40:59 UTC (rev 
6552)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2004-10-23 14:37:44 UTC (rev 
6553)
@@ -28,7 +28,7 @@
 # NOTES:
 #
 
-from gnue.common.apps import GDebug
+from gnue.common.apps import errors
 from GFValue import GFValue
 import string
 
@@ -202,8 +202,12 @@
         self._fk_descr = string.split(self.fk_key,',')
 
       self._fk_datasource = \
-         block._form._datasourceDictionary[string.lower(self.fk_source)]
+         block._form._datasourceDictionary. get (string.lower (self.fk_source))
 
+      if self._fk_datasource is None:
+        raise errors.ApplicationError, \
+            u_("Datasource '%s' not found") % self.fk_source
+
       # Reference the foreign keys to their datasources
       # (so they are selected)
       for field in [self.fk_key] + self._fk_descr:
@@ -379,7 +383,7 @@
         # TODO: What's this for?
         self._allowedValues[resultSet.current.getField(self.fk_key)] = None
       more = resultSet.nextRecord()
-    GDebug.printMesg (5,'Created for DropDown: %s' % self._allowedValues)
+    gDebug (5,'Created for DropDown: %s' % self._allowedValues)
 
   def allowedValues(self):
     return (self._allowedValues, self._allowedValuesDescr)