From fb9b219abe4a1b164442656566f844f14debef96 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Wed, 4 Oct 2017 16:00:30 +0200 Subject: [PATCH] Fixed a bug with taxonomy URIs not being read correctly --- python/obitools3/uri/decode.pyx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/obitools3/uri/decode.pyx b/python/obitools3/uri/decode.pyx index 4a3d9cf..284b995 100644 --- a/python/obitools3/uri/decode.pyx +++ b/python/obitools3/uri/decode.pyx @@ -67,10 +67,10 @@ def open_dms_element(DMS dms, bytes path, if path_parts[0]==b"taxonomy": if len(path_parts) > 1: taxo = Taxonomy.open(dms,path_parts[1]) - if len(path_parts) == 2: + if len(path_parts) == 3: taxon=taxo[int(path_parts[2])] return (dms,taxon) - elif len(path_parts) > 2: + elif len(path_parts) > 3: raise MalformedURIException('Malformed Taxonomy URI') return (dms,taxo) @@ -166,15 +166,15 @@ def open_uri(uri, if scheme==b"" or scheme==b"dms" : dms = open_dms(urip.path,create) if dms is None and default_dms is not None: - dms=(default_dms,urip.path) - - + dms=(default_dms, urip.path) + if dms is not None: try: resource=open_dms_element(dms[0],dms[1], create, newviewtype ) + scheme=b"dms" urip = ParseResultBytes(scheme=b"dms", netloc=urip.netloc, @@ -185,7 +185,7 @@ def open_uri(uri, if default_dms is None: config["obi"]["defaultdms"]=resource[0] - + return (resource[0], resource[1], type(resource[1]),