review on imports & svn keywords

[sfa.git] / geni / methods / resolve.py

diff --git a/geni/methods/resolve.py b/geni/methods/resolve.py
index 3daee24..bb43f2b 100644 (file)
--- a/geni/methods/resolve.py
+++ b/geni/methods/resolve.py
@@ -1,9 +1,12 @@
+### $Id$
+### $URL$
+
 from geni.util.faults import *
-from geni.util.excep import *
 from geni.util.method import Method
 from geni.util.parameter import Parameter, Mixed
 from geni.util.auth import Auth
 from geni.util.record import GeniRecord
+from geni.registry import Registries
 from geni.util.debug import log
 
 class resolve(Method):
@@ -18,7 +21,7 @@ class resolve(Method):
     interfaces = ['registry']
     
     accepts = [
-        Parameter(str, "credential"),
+        Parameter(str, "Credential string"),
         Parameter(str, "Human readable name (hrn)")
         ]
 
@@ -27,19 +30,15 @@ class resolve(Method):
     def call(self, cred, hrn):
         
         self.api.auth.check(cred, 'resolve')
-        
-        # is this a foreign record
-        if not hrn.startswith(self.api.hrn):
-            for registry in self.api.registries:
-                if hrn.startswith(registry):
-                    records = self.api.registries[registry].resolve(self.api.credential, name)
-                    good_records = records   
-        else:
+        good_records = [] 
+        try:
             auth_hrn = self.api.auth.get_authority(hrn)
             if not auth_hrn:
                 auth_hrn = hrn
             table = self.api.auth.get_auth_table(auth_hrn)
             records = table.resolve('*', hrn)
+            if not records:
+                raise RecordNotFound(hrn) 
             good_records = []
             for record in records:
                 try:
@@ -49,16 +48,16 @@ class resolve(Method):
                     # silently drop the ones that are missing in PL
                     print >> log, "ignoring geni record ", record.get_name(), \
                               " because pl record does not exist"
-                table.remove(record)
-
+                    table.remove(record)
+        except:
+            # is this a foreign record
+            registries = Registries(self.api)
+            credential = self.api.getCredential()
+            for registry in registries:
+                if hrn.startswith(registry) and not registry in [self.api.hrn]:
+                    records = registries[registry].resolve(credential, hrn)
+                    good_records = records
         dicts = [record.as_dict() for record in good_records]
-        if not dicts:
-            raise RecordNotFound(hrn)
 
         return dicts    
             
-
-
-                        
-                 
-        return records