X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fresolve.py;h=28d6d29084864d524aa34cbb9a9cd3ae32321d93;hb=087fe20b9e7919903c197f208d46d4432ee6380d;hp=8ad247ff9de37555c5e41dd53190e1b03f951bdf;hpb=a2e21bef1545bbb68c86ec1a84a611bde7f17a45;p=sfa.git

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 8ad247ff..28d6d290 100644
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -1,14 +1,14 @@
 ### $Id$
 ### $URL$
-
+import traceback
 from sfa.util.faults 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.util.debug import log
-
 from sfa.server.registry import Registries
+from sfa.util.prefixTree import prefixTree
 
 class resolve(Method):
     """
@@ -32,33 +32,49 @@ class resolve(Method):
         
         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)
+
+        # 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()
-            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]
+            try:
+                records = registries[registry_hrn].resolve(credential, hrn)
+                good_records = [record.as_dict() for record in records]
+                if good_records:
+                    return good_records
+            except:
+                traceback.print_exc()
+
+        # if we still havnt found the record yet, try the local registry
+        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) 
+        for record in records:
+            try:
+                self.api.fill_record_info(record)
+                good_records.append(dict(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)
+
 
-        return dicts    
+        return good_records