replaceing resolve with Resolve

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

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index f9d3223..d26625e 100644 (file)
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -1,21 +1,21 @@
 ### $Id$
 ### $URL$
-
+import traceback
+import types
 from sfa.util.faults import *
+from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
-from sfa.util.record import GeniRecord
-from sfa.util.debug import log
-
-from sfa.server.registry import Registries
+from sfa.util.record import SfaRecord
+from sfa.methods.Resolve import Resolve
 
-class resolve(Method):
+class resolve(Resolve):
     """
+    Deprecated. Use Resolve instead
     Resolve a record.
 
     @param cred credential string authorizing the caller
-    @param hrn human readable name to resolve
+    @param hrn human readable name to resolve (hrn or urn) 
     @return a list of record dictionaries or empty list     
     """
 
@@ -23,42 +23,14 @@ class resolve(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name (hrn)")
+        Mixed(Parameter(str, "Human readable name (hrn or urn)"),
+              Parameter(list, "List of Human readable names ([hrn])"))  
         ]
 
-    returns = [GeniRecord]
+    returns = [SfaRecord]
     
-    def call(self, cred, hrn):
-        
-        self.api.auth.check(cred, 'resolve')
-        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:
-                    self.api.fill_record_info(record)
-                    good_records.append(record)
-                except PlanetLabRecordDoesNotExist:
-                    # 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)
-        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]
+    def call(self, cred, xrns, origin_hrn=None):
+        return Resolve.call(self, xrns, cred)
+
 
-        return dicts