r6356 - trunk/gnue-appserver/src/classrep

[reinhard]

Author: reinhard
Date: 2004-09-21 13:36:48 -0500 (Tue, 21 Sep 2004)
New Revision: 6356

Modified:
   trunk/gnue-appserver/src/classrep/Procedure.py
   trunk/gnue-appserver/src/classrep/Property.py
Log:
Properly indicate an error if a property or procedure is accessed with
inexistant module name instead of just selecting a random one with the same
name.


Modified: trunk/gnue-appserver/src/classrep/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Procedure.py      2004-09-21 17:17:26 UTC 
(rev 6355)
+++ trunk/gnue-appserver/src/classrep/Procedure.py      2004-09-21 18:36:48 UTC 
(rev 6356)
@@ -88,10 +88,12 @@
   # Get a condition to match a given procedure
   # ---------------------------------------------------------------------------
   def _getSingleCondition (self, key):
-    procName = splitName (key) [1]
+    (module, name) = splitName (key)
 
     return ['and', self._getReloadCondition (),
-                   ['eq', ['field', u'gnue_name'], ['const', procName]]]
+                   ['eq', ['field', u'gnue_module.gnue_name'],
+                          ['const', module]],
+                   ['eq', ['field', u'gnue_name'], ['const', name]]]
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-appserver/src/classrep/Property.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Property.py       2004-09-21 17:17:26 UTC 
(rev 6355)
+++ trunk/gnue-appserver/src/classrep/Property.py       2004-09-21 18:36:48 UTC 
(rev 6356)
@@ -87,9 +87,13 @@
   # Return a condition to match a given Property
   # ---------------------------------------------------------------------------
   def _getSingleCondition (self, key):
-    propName = splitName (key) [1]
+
+    (module, name) = splitName (key)
+
     return ['and', self._getReloadCondition (),
-                  ['eq', ['field', u'gnue_name'], ['const', propName]]]
+                   ['eq', ['field', u'gnue_module.gnue_name'],
+                          ['const', module]],
+                   ['eq', ['field', u'gnue_name'], ['const', name]]]
 
 
   # ---------------------------------------------------------------------------