Merge branch 'master' of git.onelab.eu:/git/sfa

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

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index e9be62e..206b5a5 100644 (file)
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -2,65 +2,33 @@
 ### $URL$
 
 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.trust.auth import Auth
-from sfa.util.record import GeniRecord
-from sfa.server.registry import Registries
-from sfa.util.prefixTree import prefixTree
+from sfa.util.record import SfaRecord
+from sfa.methods.List import List
 
-class list(Method):
+class list(List):
     """
+    Deprecated. Use List instead.
+
     List the records in an authority. 
 
     @param cred credential string specifying the rights of the caller
-    @param hrn human readable name of authority to list
+    @param hrn human readable name of authority to list (hrn or urn)
     @return list of record dictionaries         
     """
-
     interfaces = ['registry']
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name (hrn)")
+        Parameter(str, "Human readable name (hrn or urn)"),
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
-    returns = [GeniRecord]
+    returns = [SfaRecord]
     
-    def call(self, cred, hrn):
-        
-        self.api.auth.check(cred, 'list')
-        records = []
-
-        # load all know registry names into a prefix tree and attempt to find
-        # the longest matching prefix  
-        registries = Registries(self.api)
-        hrns = registries.keys()
-        tree = prefixTree()
-        tree.load(hrns)
-        registry_hrn = tree.best_match(hrn)
-
-        #if there was no match then this record belongs to an unknow registry
-        if not registry_hrn:
-            raise MissingAuthority(hrn)
-        
-        # if the best match (longest matching hrn) is not the local registry,
-        # forward the request
-        if registry_hrn != self.api.hrn:
-            credential = self.api.getCredential()
-            try:
-                record_list = registries[registry_hrn].list(credential, hrn)
-                records = [record.as_dict() for record in record_list]
-                if records:
-                    return records
-            except:
-                pass
-
-        # if we still havnt found the record yet, try the local registry
-        if not self.api.auth.hierarchy.auth_exists(hrn):
-            raise MissingAuthority(hrn)
+    def call(self, cred, xrn, origin_hrn=None):
         
-        table = self.api.auth.get_auth_table(hrn)
-        records = table.list()
-          
-        return records
+        return List.call(self, xrn, cred)