Commit da91ffc2 authored by mercierc's avatar mercierc

URI decoding: fixed reading a taxonomy before any view

parent c8846155
......@@ -192,7 +192,7 @@ def open_uri(uri,
config = getConfiguration()
urip = urlparse(urib)
if 'obi' not in config:
config['obi']={}
......@@ -209,13 +209,14 @@ def open_uri(uri,
scheme = urip.scheme
error = None
if urib != b"-" and \
if b'/taxonomy/' in urib or \
(urib != b"-" and \
(scheme==b"dms" or \
(scheme==b"" and \
(((not input) and "outputformat" not in config["obi"]) or \
(input and "inputformat" not in config["obi"])))): # TODO maybe not best way
(input and "inputformat" not in config["obi"]))))): # TODO maybe not best way
if default_dms is not None and b"/" not in urip.path: # assuming view to open in default DMS (TODO discuss)
dms=(default_dms, urip.path)
else:
......@@ -223,7 +224,7 @@ def open_uri(uri,
if dms is None and default_dms is not None:
dms=(default_dms, urip.path)
if dms is not None:
if dms_only:
return (dms[0],
......@@ -248,7 +249,7 @@ def open_uri(uri,
if default_dms is None:
config["obi"]["defaultdms"]=resource[0]
return (resource[0],
resource[1],
type(resource[1]),
......@@ -464,7 +465,7 @@ def open_uri(uri,
if format is not None:
if seqtype==b"nuc":
objclass = Nuc_Seq # Nuc_Seq_Stored? TODO
if format==b"fasta" or format==b"silva":
if format==b"fasta" or format==b"silva" or format==b"rdp":
if input:
iseq = fastaNucIterator(file,
skip=skip,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment