updated namespace to remove authority type from urn when converting to hrn

[sfa.git] / sfa / util / namespace.py

diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py
index 61b05b9..c771d71 100644 (file)
--- a/sfa/util/namespace.py
+++ b/sfa/util/namespace.py
@@ -2,14 +2,17 @@
 ### $URL$
 
 from sfa.util.faults import *
-
 URN_PREFIX = "urn:publicid:IDN"
 
 def get_leaf(hrn):
     parts = hrn.split(".")
     return ".".join(parts[-1:])
 
-def get_authority(hrn):
+def get_authority(xrn):
+    hrn, type = urn_to_hrn(xrn)
+    if type and type == 'authority':
+        return hrn
+    
     parts = hrn.split(".")
     return ".".join(parts[:-1])
 
@@ -45,7 +48,7 @@ def slicename_to_hrn(auth_hrn, slicename):
 def email_to_hrn(auth_hrn, email):
     parts = email.split("@")
     username = parts[0]
-    username = username.replace(".", "_") 
+    username = username.replace(".", "_").replace("+", "_") 
     person_hrn = ".".join([auth_hrn, username])
     
     return person_hrn 
@@ -57,8 +60,9 @@ def urn_to_hrn(urn):
     """
 
     # if this is already a hrn dont do anything
-    if not urn.startswith(URN_PREFIX):
+    if not urn or not urn.startswith(URN_PREFIX):
         return urn, None
+
     name = urn[len(URN_PREFIX):]
     hrn_parts = name.split("+")
     
@@ -70,8 +74,12 @@ def urn_to_hrn(urn):
     # 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[:hrn.rindex('.')]        
    
-    return hrn, type 
+    return str(hrn), str(type) 
     
     
 def hrn_to_urn(hrn, type=None):
@@ -79,12 +87,23 @@ def hrn_to_urn(hrn, type=None):
     convert an hrn and type to a urn string
     """
     # if  this is already a urn dont do anything 
-    if hrn.startswith(URN_PREFIX):
+    if not hrn or hrn.startswith(URN_PREFIX):
         return hrn
 
     authority = get_authority(hrn)
     name = get_leaf(hrn)
-    urn = "+".join([unicode(part).replace('.', ':') \
-                    for part in ['',authority,type,name]])
-
+     
+    if type == 'authority':
+        authority = hrn
+        name = 'sa'   
+    
+    if authority.startswith("plc"):
+        if type == None:
+            urn = "+".join(['',authority.replace('.',':'),name])
+        else:
+            urn = "+".join(['',authority.replace('.',':'),type,name])
+
+    else:
+        urn = "+".join(['',authority,type,name])
+        
     return URN_PREFIX + urn