From eea9f8e43a22a4336ec843715741409cf3f1ca51 Mon Sep 17 00:00:00 2001 From: Lili Meszaros Date: Tue, 20 Feb 2024 16:09:04 +0000 Subject: [PATCH] RT728517: fix order based on portal api query --- python3/enaDataGet.py | 2 +- python3/enaGroupGet.py | 2 +- python3/utils.py | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/python3/enaDataGet.py b/python3/enaDataGet.py index c0af1fa..ef37afd 100644 --- a/python3/enaDataGet.py +++ b/python3/enaDataGet.py @@ -52,7 +52,7 @@ def set_parser(): parser.add_argument('-as', '--aspera-settings', default=None, help="""Use the provided settings file, will otherwise check for environment variable or default settings file location.""") - parser.add_argument('-v', '--version', action='version', version='%(prog)s 1.7.0') + parser.add_argument('-v', '--version', action='version', version='%(prog)s 1.7.1') return parser diff --git a/python3/enaGroupGet.py b/python3/enaGroupGet.py index 4d88f9e..55a498c 100644 --- a/python3/enaGroupGet.py +++ b/python3/enaGroupGet.py @@ -58,7 +58,7 @@ def set_parser(): for environment variable or default settings file location.""") parser.add_argument('-t', '--subtree', action='store_true', help='Include subordinate taxa (taxon subtree) when querying with NCBI tax ID (default is false)') - parser.add_argument('-v', '--version', action='version', version='%(prog)s 1.7.0') + parser.add_argument('-v', '--version', action='version', version='%(prog)s 1.7.1') return parser diff --git a/python3/utils.py b/python3/utils.py index ca9dcbc..b3e4ca4 100644 --- a/python3/utils.py +++ b/python3/utils.py @@ -590,15 +590,15 @@ def split_filelist(filelist_string): def parse_file_search_result_line(line, accession, output_format): cols = line.split('\t') - data_acc = cols[0].strip() - sub_filelist = split_filelist(cols[1]) - sub_md5list = split_filelist(cols[2]) + data_acc = cols[-1].strip() + sub_filelist = split_filelist(cols[0]) + sub_md5list = split_filelist(cols[1]) if is_analysis(accession): return data_acc, sub_filelist, sub_md5list - sra_filelist = split_filelist(cols[3]) - sra_md5list = split_filelist(cols[4]) - fastq_filelist = split_filelist(cols[5]) - fastq_md5list = split_filelist(cols[6]) + sra_filelist = split_filelist(cols[2]) + sra_md5list = split_filelist(cols[3]) + fastq_filelist = split_filelist(cols[4]) + fastq_md5list = split_filelist(cols[5]) if output_format is None: if len(sub_filelist) > 0: output_format = SUBMITTED_FORMAT