From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 9 Jan 2013 20:46:43 +0000 (-0500)
Subject: don't try to guess an hrn's type
X-Git-Tag: sfa-3.0-0~35
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7f25366ea485a55f5a24cca8156d52a1dd302263;p=sfa.git

don't try to guess an hrn's type
---

diff --git a/sfa/util/xrn.py b/sfa/util/xrn.py
index dfcf3e5b..b0db4c1d 100644
--- a/sfa/util/xrn.py
+++ b/sfa/util/xrn.py
@@ -117,15 +117,7 @@ class Xrn:
 
         for urn in urns:
             xrn = Xrn(xrn=urn)
-            if not xrn.type:
-                # If an xrn doesn't have a type its probably a hrn. 
-                # We have to make some assumptions on the hrn's type
-                # based on the contents of the hrn.  
-                if type == 'sliver' and '-' in xrn.leaf:
-                    urn_list.append(urn) 
-                elif type != 'sliver' and not '-' in xrn.leaf:
-                    urn_list.append(urn)
-            elif (xrn.type == type):
+            if (xrn.type == type):
                 # Xrn is probably a urn so we can just compare types  
                 urn_list.append(urn)
         return urn_list