Skip to content

Commit

Permalink
Replace extra_files_path with files_path.
Browse files Browse the repository at this point in the history
Bjoen: As far as I know, that is now the recommended way. And
extra_files_path seems to be broken in conjunction with the
object store.

Peter: Confirmed with @jmchilton on pull request #44 discussion
that this is now the preferred way to do this.
  • Loading branch information
bgruening authored and peterjc committed Dec 14, 2014
1 parent ae87914 commit 2bbbf7f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/ncbi_blast_plus/ncbi_dustmasker_wrapper.xml
Expand Up @@ -13,7 +13,7 @@ dustmasker
#if $db_opts.db_opts_selector == "db":
-in "${db_opts.database.fields.path}" -infmt blastdb
#elif $db_opts.db_opts_selector == "histdb":
-in "${os.path.join($db_opts.histdb.extra_files_path, 'blastdb')}" -infmt blastdb
-in "${os.path.join($db_opts.histdb.files_path, 'blastdb')}" -infmt blastdb
#else:
-in "$subject" -infmt fasta
#end if
Expand Down
2 changes: 1 addition & 1 deletion tools/ncbi_blast_plus/ncbi_macros.xml
Expand Up @@ -351,7 +351,7 @@
#if $db_opts.db_opts_selector == "db":
-db "${db_opts.database.fields.path}"
#elif $db_opts.db_opts_selector == "histdb":
-db "${os.path.join($db_opts.histdb.extra_files_path,'blastdb')}"
-db "${os.path.join($db_opts.histdb.files_path,'blastdb')}"
#else:
-subject "$db_opts.subject"
#end if
Expand Down
2 changes: 1 addition & 1 deletion tools/ncbi_blast_plus/ncbi_makeblastdb.xml
Expand Up @@ -10,7 +10,7 @@
##and abort (via the ampersand ampersand trick) if any are found.
#for i in $input_file#"${i}" #end for#
&&
makeblastdb -out "${os.path.join($outfile.extra_files_path,'blastdb')}"
makeblastdb -out "${os.path.join($outfile.files_path,'blastdb')}"
$parse_seqids
$hash_index
## Single call to -in with multiple filenames space separated with outer quotes
Expand Down
2 changes: 1 addition & 1 deletion tools/ncbi_blast_plus/ncbi_rpsblast_wrapper.xml
Expand Up @@ -15,7 +15,7 @@ rpsblast
#if $db_opts.db_opts_selector == "db":
-db "${db_opts.database.fields.path}"
#elif $db_opts.db_opts_selector == "histdb":
-db "${os.path.join($db_opts.histdb.extra_files_path,'blastdb')}"
-db "${os.path.join($db_opts.histdb.files_path,'blastdb')}"
#end if
-evalue $evalue_cutoff
@BLAST_OUTPUT@
Expand Down
2 changes: 1 addition & 1 deletion tools/ncbi_blast_plus/ncbi_rpstblastn_wrapper.xml
Expand Up @@ -15,7 +15,7 @@ rpstblastn
#if $db_opts.db_opts_selector == "db":
-db "${db_opts.database.fields.path}"
#elif $db_opts.db_opts_selector == "histdb":
-db "${os.path.join($db_opts.histdb.extra_files_path,'blastdb')}"
-db "${os.path.join($db_opts.histdb.files_path,'blastdb')}"
#end if
-evalue $evalue_cutoff
@BLAST_OUTPUT@
Expand Down

3 comments on commit 2bbbf7f

@jmchilton
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait - I think we actually decided $output.files_path - but this is an input so it should probably still be $input.extra_files_path. https://lists.galaxyproject.org/pipermail/galaxy-dev/2014-June/019758.html

@peterjc
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK - that does explain the regression reported as #69 - thanks John.

@peterjc
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted with 10f8128 (this repeated pattern is now a single macro).

Please sign in to comment.