X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fnamespace.py;h=93186c969a927a769aab8dacf6fe729a57c36674;hb=eababa96fb603cdd552bc03091813544b099befd;hp=61b05b9142747eda430a19dc30cc75589abf6f59;hpb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;p=sfa.git

diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py
index 61b05b91..93186c96 100644
--- a/sfa/util/namespace.py
+++ b/sfa/util/namespace.py
@@ -1,29 +1,40 @@
 ### $Id$
 ### $URL$
-
+import re
 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])
 
 def hrn_to_pl_slicename(hrn):
+    # remove any escaped no alpah numeric characters
+    #hrn = re.sub('\\\[^a-zA-Z0-9]', '', hrn)
+    # remove any escaped '.' (i.e. '\.')
+    hrn = hrn.replace('\\.', '')
     parts = hrn.split(".")
     return parts[-2] + "_" + parts[-1]
 
 # assuming hrn is the hrn of an authority, return the plc authority name
 def hrn_to_pl_authname(hrn):
+    # remove any escaped '.' (i.e. '\.')
+    hrn = hrn.replace('\\.', '')
     parts = hrn.split(".")
     return parts[-1]
 
 # assuming hrn is the hrn of an authority, return the plc login_base
 def hrn_to_pl_login_base(hrn):
+    # remove any escaped '.' (i.e. '\.')
+    hrn = hrn.replace('\\.', '')
     return hrn_to_pl_authname(hrn)
 
 def hostname_to_hrn(auth_hrn, login_base, hostname):
@@ -45,7 +56,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,21 +68,26 @@ 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("+")
+    type = hrn_parts.pop(2)
     
-    # type is always the second to last element in the list
-    type = hrn_parts.pop(-2)
-
-    # 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]) 
-   
-    return hrn, type 
+         
+    # 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
+    # 1. remove blank elements
+    # 2. escape '.'            # '.' exists in protogeni object names and are not delimiters
+    # 3. replace ':' with '.'  # ':' is the urn hierarchy delimiter
+    # 4. join list elements using '.' 
+    hrn = '.'.join([part.replace('.', '\\.').replace(':', '.') for part in hrn_parts if part]) 
+    
+    return str(hrn), str(type) 
     
     
 def hrn_to_urn(hrn, type=None):
@@ -79,12 +95,30 @@ 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'   
+    else:
+        authority = get_authority(hrn)
+        name = get_leaf(hrn)   
+   
+    # We have to do the following conversion
+    # '\\.'  -> '.'    # where '.' belongs in the urn name
+    # '.'    -> ':"    # where ':' is the urn hierarchy delimiter
+    # by doing the following
+    # 1. split authority around '\\.'
+    # 2. replace '.' with ':' in all parts
+    # 3. join parts around '.'  
+    parts = authority.split('\\.')
+    authority = '.'.join([part.replace('.', ':') for part in parts])
+    
+    if type == None:
+        urn = "+".join(['',authority,name])
+    else:
+        urn = "+".join(['',authority,type,name])
 
+        
     return URN_PREFIX + urn