| Previous changeset 4:ef2031036f47 (2018-11-26) Next changeset 6:d22f69a2e80e (2019-07-23) |
|
Commit message:
Uploaded |
|
modified:
data_manager/salmon_index_builder.py data_manager_conf.xml |
| b |
| diff -r ef2031036f47 -r 3888ec1918d0 data_manager/salmon_index_builder.py --- a/data_manager/salmon_index_builder.py Mon Nov 26 10:53:58 2018 -0500 +++ b/data_manager/salmon_index_builder.py Thu Jan 03 10:51:18 2019 -0500 |
| [ |
| @@ -30,17 +30,19 @@ target_directory = params[ 'output_data' ][0]['extra_files_path'] if not os.path.exists( target_directory ): os.mkdir( target_directory ) + path=sequence_id args = [ 'salmon', 'index' ] if options.kmer_size != '': args.append('-k') args.append(options.kmer_size) + path=path + '_kmer_'+ options.kmer_size args.extend( [ '-t' , options.fasta_filename, '-i', target_directory ] ) proc = subprocess.Popen( args=args, shell=False) return_code = proc.wait() if return_code: print("Error building index.", file=sys.stderr) sys.exit( return_code ) - data_table_entry = dict( value=sequence_id, dbkey=options.fasta_dbkey, name=sequence_name, path=sequence_id ) + data_table_entry = dict( value=sequence_id, dbkey=options.fasta_dbkey, name=sequence_name, path=path ) _add_data_table_entry( data_manager_dict, data_table_name, data_table_entry ) |
| b |
| diff -r ef2031036f47 -r 3888ec1918d0 data_manager_conf.xml --- a/data_manager_conf.xml Mon Nov 26 10:53:58 2018 -0500 +++ b/data_manager_conf.xml Thu Jan 03 10:51:18 2019 -0500 |
| b |
| @@ -9,9 +9,9 @@ <column name="path" output_ref="out_file" > <move type="directory" relativize_symlinks="True"> <!-- <source>${path}</source>--> <!-- out_file.extra_files_path is used as base by default --> <!-- if no source, eg for type=directory, then refers to base --> - <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">${dbkey}/salmon_index/${value}</target> + <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">${dbkey}/salmon_index/${path}</target> </move> - <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/${dbkey}/salmon_index/${value}/${path}</value_translation> + <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/${dbkey}/salmon_index/${path}</value_translation> <value_translation type="function">abspath</value_translation> </column> </output> |