git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38b7e03
)
fix bug in urn_to_hrn()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 20 Sep 2010 16:35:46 +0000
(12:35 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 20 Sep 2010 16:35:46 +0000
(12:35 -0400)
sfa/util/namespace.py
patch
|
blob
|
history
diff --git
a/sfa/util/namespace.py
b/sfa/util/namespace.py
index
53a2800
..
f53808c
100644
(file)
--- 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("+")
name = urn[len(URN_PREFIX):]
hrn_parts = name.split("+")
-
type = hrn_parts.pop(2)
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])
# 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)
return str(hrn), str(type)