Commit a085ea76 authored by Ryan Herbert's avatar Ryan Herbert Committed by Mathieu Giraud
Browse files

revert 06a56bd4 and reapply pre_process filename

What first appeared to help the situation by optimising a database query
turned out to break several tests and inner workings of the custom fuse
by preventing the fusing of the same file multiple times

See #3154
parent f65205fe
...@@ -760,13 +760,11 @@ def custom_fuse(file_list): ...@@ -760,13 +760,11 @@ def custom_fuse(file_list):
## fuse.py ## fuse.py
output_file = out_folder+'/'+output_filename+'.fused' output_file = out_folder+'/'+output_filename+'.fused'
files = "" files = ""
query = db(db.results_file.id.belongs(file_list) & for id in file_list :
(db.sequence_file.id == db.results_file.sequence_file_id) if db.results_file[id].data_file is not None :
).select() files += os.path.abspath(defs.DIR_RESULTS + db.results_file[id].data_file)
for row in query : seq_file = db.sequence_file[db.results_file[id].sequence_file_id]
if row.results_file.data_file is not None : if seq_file.pre_process_file is not None:
files += os.path.abspath(defs.DIR_RESULTS + row.results_file.data_file)
if row.sequence_file.pre_process_file is not None:
files += ",%s" % os.path.abspath(defs.DIR_RESULTS + row.sequence_file.pre_process_file) files += ",%s" % os.path.abspath(defs.DIR_RESULTS + row.sequence_file.pre_process_file)
files += " " files += " "
......
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