# HG changeset patch
# User peterjc
# Date 1359049241 18000
# Node ID a23b0627623c5662f56bf9c29c32e0fbdfd3b15f
# Parent  393a7a35383cd19dd11d1c528bc5c7529d67b35d
Uploaded v0.0.15, clearer warning about searching against a FASTA file.

diff -r 393a7a35383c -r a23b0627623c tools/ncbi_blast_plus/ncbi_blast_plus.txt
--- a/tools/ncbi_blast_plus/ncbi_blast_plus.txt	Fri Nov 09 06:53:55 2012 -0500
+++ b/tools/ncbi_blast_plus/ncbi_blast_plus.txt	Thu Jan 24 12:40:41 2013 -0500
@@ -1,7 +1,7 @@
 Galaxy wrappers for NCBI BLAST+ suite
 =====================================
 
-These wrappers are copyright 2010-2012 by Peter Cock, The James Hutton Institute
+These wrappers are copyright 2010-2013 by Peter Cock, The James Hutton Institute
 (formerly SCRI, Scottish Crop Research Institute), UK. All rights reserved.
 See the licence text below.
 
@@ -27,7 +27,8 @@
 databases like NR).
 
 You will also need to install 'blast_datatypes' from the Tool Shed. This
-defines the BLAST XML file format ('blastxml').
+defines the BLAST XML file format ('blastxml') and protein and nucleotide
+BLAST databases composite file formats ('blastdbp' and 'blastdbn').
 
 
 History
@@ -42,8 +43,11 @@
           e-values
 v0.0.13 - Use the new error handling options in Galaxy (the previously
           bundled hide_stderr.py script is no longer needed).
-v0.0.14 - Support for makeblastdb and local BLAST databases in the history
-          (using work from Edward Kirton).
+v0.0.14 - Support for makeblastdb and blastdbinfo with local BLAST databases
+          in the history (using work from Edward Kirton), requires v0.0.14
+          of the 'blast_datatypes' repository from the Tool Shed.
+v0.0.15 - Stronger warning in help text against searching against subject
+          FASTA files (better looking e-values than you might be expecting).
 
 
 Developers
@@ -82,5 +86,5 @@
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
 OR PERFORMANCE OF THIS SOFTWARE.
 
-NOTE: This is the licence for the Galaxy Wrapper only. BLAST+ and
+NOTE: This is the licence for the Galaxy Wrapper only. NCBI BLAST+ and
 associated data files are available and licenced separately.
diff -r 393a7a35383c -r a23b0627623c tools/ncbi_blast_plus/ncbi_blastn_wrapper.xml
--- a/tools/ncbi_blast_plus/ncbi_blastn_wrapper.xml	Fri Nov 09 06:53:55 2012 -0500
+++ b/tools/ncbi_blast_plus/ncbi_blastn_wrapper.xml	Thu Jan 24 12:40:41 2013 -0500
@@ -1,4 +1,4 @@
-<tool id="ncbi_blastn_wrapper" name="NCBI BLAST+ blastn" version="0.0.14">
+<tool id="ncbi_blastn_wrapper" name="NCBI BLAST+ blastn" version="0.0.15">
     <description>Search nucleotide database with nucleotide query sequence(s)</description>
     <!-- If job splitting is enabled, break up the query file into parts -->
     <parallelism method="multi" split_inputs="query" split_mode="to_size" split_size="1000" shared_inputs="subject,histdb" merge_outputs="output1"></parallelism>
@@ -55,7 +55,7 @@
             <param name="db_opts_selector" type="select" label="Subject database/sequences">
               <option value="db" selected="True">BLAST Database</option>
               <option value="histdb">BLAST database from your history</option>
-              <option value="file">FASTA file from your history (pairwise e-values)</option>
+              <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
                 <param name="database" type="select" label="Nucleotide BLAST database">
@@ -162,6 +162,15 @@
 using the NCBI BLAST+ blastn command line tool.
 Algorithms include blastn, megablast, and discontiguous megablast.
 
+.. class:: warningmark
+
+You can also search against a FASTA file of subject nucleotide
+sequences. This is *not* advised because it is slower (only one
+CPU is used), but more importantly gives e-values for pairwise
+searches (very small e-values which will look overly signficiant).
+In most cases you should instead turn the other FASTA file into a
+database first using *makeblastdb* and search against that.
+
 -----
 
 **Output format**
diff -r 393a7a35383c -r a23b0627623c tools/ncbi_blast_plus/ncbi_blastp_wrapper.xml
--- a/tools/ncbi_blast_plus/ncbi_blastp_wrapper.xml	Fri Nov 09 06:53:55 2012 -0500
+++ b/tools/ncbi_blast_plus/ncbi_blastp_wrapper.xml	Thu Jan 24 12:40:41 2013 -0500
@@ -1,4 +1,4 @@
-<tool id="ncbi_blastp_wrapper" name="NCBI BLAST+ blastp" version="0.0.14">
+<tool id="ncbi_blastp_wrapper" name="NCBI BLAST+ blastp" version="0.0.15">
     <description>Search protein database with protein query sequence(s)</description>
     <!-- If job splitting is enabled, break up the query file into parts -->
     <parallelism method="multi" split_inputs="query" split_mode="to_size" split_size="1000" shared_inputs="subject,histdb" merge_outputs="output1"></parallelism>
@@ -56,7 +56,7 @@
             <param name="db_opts_selector" type="select" label="Subject database/sequences">
               <option value="db" selected="True">BLAST Database</option>
               <option value="histdb">BLAST database from your history</option>
-              <option value="file">FASTA file from your history (pairwise e-values)</option>
+              <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
                 <param name="database" type="select" label="Protein BLAST database">
@@ -227,6 +227,15 @@
 Search a *protein database* using a *protein query*,
 using the NCBI BLAST+ blastp command line tool.
 
+.. class:: warningmark
+
+You can also search against a FASTA file of subject protein
+sequences. This is *not* advised because it is slower (only one
+CPU is used), but more importantly gives e-values for pairwise
+searches (very small e-values which will look overly signficiant).
+In most cases you should instead turn the other FASTA file into a
+database first using *makeblastdb* and search against that.
+
 -----
 
 **Output format**
diff -r 393a7a35383c -r a23b0627623c tools/ncbi_blast_plus/ncbi_blastx_wrapper.xml
--- a/tools/ncbi_blast_plus/ncbi_blastx_wrapper.xml	Fri Nov 09 06:53:55 2012 -0500
+++ b/tools/ncbi_blast_plus/ncbi_blastx_wrapper.xml	Thu Jan 24 12:40:41 2013 -0500
@@ -1,4 +1,4 @@
-<tool id="ncbi_blastx_wrapper" name="NCBI BLAST+ blastx" version="0.0.14">
+<tool id="ncbi_blastx_wrapper" name="NCBI BLAST+ blastx" version="0.0.15">
     <description>Search protein database with translated nucleotide query sequence(s)</description>
     <!-- If job splitting is enabled, break up the query file into parts -->
     <parallelism method="multi" split_inputs="query" split_mode="to_size" split_size="1000" shared_inputs="subject,histdb" merge_outputs="output1"></parallelism>
@@ -56,7 +56,7 @@
             <param name="db_opts_selector" type="select" label="Subject database/sequences">
               <option value="db" selected="True">BLAST Database</option>
               <option value="histdb">BLAST database from your history</option>
-              <option value="file">FASTA file from your history (pairwise e-values)</option>
+              <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
                 <param name="database" type="select" label="Protein BLAST database">
@@ -215,6 +215,15 @@
 Search a *protein database* using a *translated nucleotide query*,
 using the NCBI BLAST+ blastx command line tool.
 
+.. class:: warningmark
+
+You can also search against a FASTA file of subject protein
+sequences. This is *not* advised because it is slower (only one
+CPU is used), but more importantly gives e-values for pairwise
+searches (very small e-values which will look overly signficiant).
+In most cases you should instead turn the other FASTA file into a
+database first using *makeblastdb* and search against that.
+
 -----
 
 **Output format**
diff -r 393a7a35383c -r a23b0627623c tools/ncbi_blast_plus/ncbi_tblastn_wrapper.xml
--- a/tools/ncbi_blast_plus/ncbi_tblastn_wrapper.xml	Fri Nov 09 06:53:55 2012 -0500
+++ b/tools/ncbi_blast_plus/ncbi_tblastn_wrapper.xml	Thu Jan 24 12:40:41 2013 -0500
@@ -1,4 +1,4 @@
-<tool id="ncbi_tblastn_wrapper" name="NCBI BLAST+ tblastn" version="0.0.14">
+<tool id="ncbi_tblastn_wrapper" name="NCBI BLAST+ tblastn" version="0.0.15">
     <description>Search translated nucleotide database with protein query sequence(s)</description>
     <!-- If job splitting is enabled, break up the query file into parts -->
     <parallelism method="multi" split_inputs="query" split_mode="to_size" split_size="1000" shared_inputs="subject,histdb" merge_outputs="output1"></parallelism>
@@ -56,7 +56,7 @@
             <param name="db_opts_selector" type="select" label="Subject database/sequences">
               <option value="db" selected="True">BLAST Database</option>
               <option value="histdb">BLAST database from your history</option>
-              <option value="file">FASTA file from your history (pairwise e-values)</option>
+              <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
                 <param name="database" type="select" label="Nucleotide BLAST database">
@@ -261,6 +261,15 @@
 Search a *translated nucleotide database* using a *protein query*,
 using the NCBI BLAST+ tblastn command line tool.
 
+.. class:: warningmark
+
+You can also search against a FASTA file of subject nucleotide
+sequences. This is *not* advised because it is slower (only one
+CPU is used), but more importantly gives e-values for pairwise
+searches (very small e-values which will look overly signficiant).
+In most cases you should instead turn the other FASTA file into a
+database first using *makeblastdb* and search against that.
+
 -----
 
 **Output format**
diff -r 393a7a35383c -r a23b0627623c tools/ncbi_blast_plus/ncbi_tblastx_wrapper.xml
--- a/tools/ncbi_blast_plus/ncbi_tblastx_wrapper.xml	Fri Nov 09 06:53:55 2012 -0500
+++ b/tools/ncbi_blast_plus/ncbi_tblastx_wrapper.xml	Thu Jan 24 12:40:41 2013 -0500
@@ -1,4 +1,4 @@
-<tool id="ncbi_tblastx_wrapper" name="NCBI BLAST+ tblastx" version="0.0.14">
+<tool id="ncbi_tblastx_wrapper" name="NCBI BLAST+ tblastx" version="0.0.15">
     <description>Search translated nucleotide database with translated nucleotide query sequence(s)</description>
     <!-- If job splitting is enabled, break up the query file into parts -->
     <parallelism method="multi" split_inputs="query" split_mode="to_size" split_size="1000" shared_inputs="subject,histdb" merge_outputs="output1"></parallelism>
@@ -56,7 +56,7 @@
             <param name="db_opts_selector" type="select" label="Subject database/sequences">
               <option value="db" selected="True">BLAST Database</option>
               <option value="histdb">BLAST database from your history</option>
-              <option value="file">FASTA file from your history (pairwise e-values)</option>
+              <option value="file">FASTA file from your history (see warning note below)</option>
             </param>
             <when value="db">
                 <param name="database" type="select" label="Nucleotide BLAST database">
@@ -203,6 +203,15 @@
 Search a *translated nucleotide database* using a *protein query*,
 using the NCBI BLAST+ tblastx command line tool.
 
+.. class:: warningmark
+
+You can also search against a FASTA file of subject nucleotide
+sequences. This is *not* advised because it is slower (only one
+CPU is used), but more importantly gives e-values for pairwise
+searches (very small e-values which will look overly signficiant).
+In most cases you should instead turn the other FASTA file into a
+database first using *makeblastdb* and search against that.
+
 -----
 
 **Output format**