From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 20 Sep 2010 16:35:46 +0000 (-0400)
Subject: fix bug in urn_to_hrn()
X-Git-Tag: sfa-1.0-2~29
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=595d976060944cf80e6bafe4e4c99e33de34fe83;p=sfa.git

fix bug in urn_to_hrn()
---

diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py
index 53a28005..f53808cb 100644
--- a/sfa/util/namespace.py
+++ b/sfa/util/namespace.py
@@ -65,19 +65,18 @@ def urn_to_hrn(urn):
 
     name = urn[len(URN_PREFIX):]
     hrn_parts = name.split("+")
-    
     type = hrn_parts.pop(2)
 
+    # Remove the authority name (e.g. '.sa')
+    if type == 'authority':
+        hrn_parts = hrn_parts[:-1]
+
     # convert hrn_parts (list) into hrn (str) by doing the following    
     # remove blank elements
     # replace ':' with '.'
     # join list elements using '.'
     hrn = '.'.join([part.replace(':', '.') for part in hrn_parts if part]) 
     
-    # Remove the authority name (e.g. '.sa')
-    if type == 'authority':
-        hrn = hrn.replace ('.sa', '')        
-   
     return str(hrn), str(type)