# HG changeset patch # User sh477 # Date 1645550875 0 # Node ID a7f871f7d3df8a7be901e30fea9fae3847b4cc29 # Parent 612026ea6db5330dbc4aaaa61f0ede3a76e94900 Minor fixes in python script diff -r 612026ea6db5 -r a7f871f7d3df data_manager/data_manager_vep_cache_download.py --- a/data_manager/data_manager_vep_cache_download.py Tue Feb 22 16:26:44 2022 +0000 +++ b/data_manager/data_manager_vep_cache_download.py Tue Feb 22 17:27:55 2022 +0000 @@ -19,8 +19,8 @@ # Process parameters for metadata and file download url = params['param_dict']['url'].rstrip("/") + "/" + params['param_dict']['file_name'].lstrip("/") m = re.search(r"_([^_]*?)_vep_(\d+?)_", params['param_dict']['file_name']) - version = str(m.group(1)) - cache_type = m.group(0) if m.group(0) == "merged" or m.group(0) == "refseq" else "default" + version = str(m.group(2)) + cache_type = m.group(1) if m.group(1) == "merged" or m.group(1) == "refseq" else "default" # Download and extract given cache archive, remove archive afterwards final_file, headers = urlretrieve(url, os.path.join(target_directory, params['param_dict']['file_name'])) @@ -37,7 +37,7 @@ 'value': params['param_dict']['file_name'].strip(".tar.gz"), 'dbkey': params['param_dict']['dbkey'], 'version': version, - 'cachetype': ctype, + 'cachetype': cache_type, 'name': params['param_dict']['display_name'], 'path': './%s' % params['param_dict']['file_name'].strip(".tar.gz") }