# HG changeset patch
# User peterjc
# Date 1366894888 14400
# Node ID e77e30f1deebfa33267bfb43678ed2166aab9357
# Parent  d42346e675c4d5098b800b1fd4bb066df52110af
Uploaded v0.0.19 preview take 3, fixes RPS-BLAST and RPS-TBLASTN output labelling.

diff -r d42346e675c4 -r e77e30f1deeb tool-data/blastdb_d.loc.sample
--- a/tool-data/blastdb_d.loc.sample	Wed Apr 17 10:04:28 2013 -0400
+++ b/tool-data/blastdb_d.loc.sample	Thu Apr 25 09:01:28 2013 -0400
@@ -8,6 +8,9 @@
 #It is important that the actual database name does not have a space in it,
 #and that there are only two tabs on each line.
 #
+#You can download the NCBI provided databases as tar-balls from here:
+#ftp://ftp.ncbi.nih.gov/pub/mmdb/cdd/little_endian/
+#
 #So, for example, if your database is CDD and the path to your base name
 #is /data/blastdb/Cdd, then the blastdb_d.loc entry would look like this:
 #
diff -r d42346e675c4 -r e77e30f1deeb tools/ncbi_blast_plus/ncbi_makeblastdb.xml
--- a/tools/ncbi_blast_plus/ncbi_makeblastdb.xml	Wed Apr 17 10:04:28 2013 -0400
+++ b/tools/ncbi_blast_plus/ncbi_makeblastdb.xml	Thu Apr 25 09:01:28 2013 -0400
@@ -102,10 +102,6 @@
         </change_format>
     </data>
 </outputs>
-<requirements>
-    <requirement type="binary">makeblastdb</requirement>
-    <requirement type="package" version="2.2.26+">blast+</requirement>
-</requirements>
 <help>
 **What it does**
 
diff -r d42346e675c4 -r e77e30f1deeb tools/ncbi_blast_plus/ncbi_rpsblast_wrapper.xml
--- a/tools/ncbi_blast_plus/ncbi_rpsblast_wrapper.xml	Wed Apr 17 10:04:28 2013 -0400
+++ b/tools/ncbi_blast_plus/ncbi_rpsblast_wrapper.xml	Thu Apr 25 09:01:28 2013 -0400
@@ -113,7 +113,7 @@
         </conditional>
     </inputs>
     <outputs>
-        <data name="output1" format="tabular" label="RPS-BLAST on ${database.fields.name}">
+        <data name="output1" format="tabular" label="RPS-BLAST on ${db_opts.db_opts_selector}">
             <change_format>
                 <when input="out_format" value="0" format="txt"/>
                 <when input="out_format" value="0 -html" format="html"/>