# HG changeset patch
# User peterjc
# Date 1536933356 14400
# Node ID d4111d1de76f5c39a3c859fb789f10457067889c
# Parent  ee917702dbd8ade8c1e97fb4164040b87878a879
v0.0.8, expose kodoja_VRL.tsv output

diff -r ee917702dbd8 -r d4111d1de76f README.rst
--- a/README.rst	Mon Sep 10 09:16:13 2018 -0400
+++ b/README.rst	Fri Sep 14 09:55:56 2018 -0400
@@ -54,17 +54,29 @@
     $ wget https://zenodo.org/record/1406071/files/kodojaDB_v1.0.tar.gz
     $ tar -zxvf kodojaDB_v1.0.tar.gz
 
-Then update your Galaxy configuration in ``tool-data/kraken_databases.loc``
-to add a line like this::
+Each installed version of Kodoja (or Kraken or Kaiju) will have its own
+``*.loc`` files, which Galaxy will merge into a single list. e.g.::
+
+    $ find /path/to/galaxy/tool-data -name kaiju_databases.loc
+    $ find /path/to/galaxy/tool-data -name kraken_databases.loc
+
+Edit a ``kraken_databases.loc`` file to add a line like this, where
+``(tab)`` represents inserting a tab character (NOT spaces)::
 
     kodojaDB_v1.0_kraken(tab)KodojaDB v1.0 (kraken), Sept 2018(tab)/mnt/shared/data/kodojaDB_v1.0/krakenDB
 
-And likewise update ``tool-data/kaiju_databases.loc`` with a line like::
+And likewise update ``kaiju_databases.loc`` with a line like::
 
     kodojaDB_v1.0_kaiju(tab)KodojaDB v1.0 (kaiju), Sept 2018(tab)/mnt/shared/data/kodojaDB_v1.0/kaijuDB
 
 At the time of writing, reloading the ``*.loc`` files required restarting
-the Galaxy server.
+the Galaxy server, or doing this explicitly via the "Data tables registry"
+available under Server Administration if logged into Galaxy as an administator.
+
+It is our personal preference to work with ``tool-data/kraken_databases.loc``
+and ``tool-data/kaiju_databases.loc``, but if these are being ignored, you
+*may* need to enable this by adding the XML data table entries from our file
+``tool_data_table_conf.xml.sample`` to ``config/tool_data_table_conf.xml``.
 
 
 History
@@ -80,6 +92,9 @@
 v0.0.7  - Minor update to call ``kodoja_search.py`` v0.0.6.
         - Update help text, including zeros in columns 6 and 7.
         - Support ``$GALAXY_SLOTS``, defaulting to using four threads.
+v0.0.8  - Minor update to call ``kodoja_search.py`` v0.0.8.
+        - Option to capture the ``kodoja_VRL.tsv`` read table.
+        - Accept ``kraken_databases.loc`` entry style for old Kraken wrapper.
 ======= ======================================================================
 
 
diff -r ee917702dbd8 -r d4111d1de76f kodoja_search.xml
--- a/kodoja_search.xml	Mon Sep 10 09:16:13 2018 -0400
+++ b/kodoja_search.xml	Fri Sep 14 09:55:56 2018 -0400
@@ -1,13 +1,16 @@
-<tool id="kodoja_search" name="Kodoja database search" version="0.0.7">
+<tool id="kodoja_search" name="Kodoja database search" version="0.0.8">
     <description>identify viruses from plant RNA sequencing data</description>
     <requirements>
-        <requirement type="package" version="0.0.7">kodoja</requirement>
+        <requirement type="package" version="0.0.8">kodoja</requirement>
     </requirements>
     <version_command>kodoja_search.py --version</version_command>
     <command detect_errors="exit_code"><![CDATA[
+## This if statement is for backward compatibility as early versions of the Kraken
+## wrapper assumed the UI facing field name was also part of the directory path
+if [ -d '${kraken_db.fields.path}/${kraken_db.fields.name}' ]; then export KRAKEN_DEFAULT_DB='${kraken_db.fields.path}/${kraken_db.fields.name}'; else export KRAKEN_DEFAULT_DB='${kraken_db.fields.path}'; fi &&
 kodoja_search.py
 -t="\${GALAXY_SLOTS:-4}"
---kraken_db '${kraken_db.fields.path}'
+--kraken_db "\$KRAKEN_DEFAULT_DB"
 --kaiju_db '${kaiju_db.fields.path}'
 
 #if $single_paired.single_paired_selector == 'yes'
@@ -40,6 +43,10 @@
 -o .
 &&
 mv ./virus_table.txt '$combined_table'
+#if $capture_reads_table:
+&&
+mv ./kodoja_VRL.txt '$reads_table'
+#end if
 ]]></command>
     <inputs>
         <param label="Select a Kraken database" name="kraken_db" type="select">
@@ -68,9 +75,13 @@
                 <param format="fasta,fastq" label="Input sequences" name="input_sequences" type="data" help="FASTA or FASTQ datasets"/>
             </when>
         </conditional>
+        <param name="capture_reads_table" type="boolean" value="false" label="Capture read assignment table" help="This table can be used to filter out reads matched to (individual) viruses"/>
     </inputs>
     <outputs>
         <data name="combined_table" format="tabular" label="Kodoja species report for ${on_string}" />
+        <data name="reads_table" format="tabular" label="Kodoja read assignment for ${on_string}">
+            <filter>capture_reads_table</filter>
+        </data>
     </outputs>
     <tests>
         <test>
@@ -92,6 +103,16 @@
             <param name="kraken_db" value="kraken3viruses" />
             <param name="kaiju_db" value="kaiju3viruses" />
             <param name="single_paired_selector" value="yes" />
+            <param name="forward_input" value="testData_1.fastq" ftype="fastq" />
+            <param name="reverse_input" value="testData_2.fastq" ftype="fastq" />
+            <param name="capture_reads_table" value="true" />
+            <output name="combined_table" file="virus_table_PE_fastq.tabular" ftype="tabular" />
+            <output name="reads_table" file="read_table_PE_fastq.tabular" ftype="tabular" />
+        </test>
+        <test>
+            <param name="kraken_db" value="kraken3viruses" />
+            <param name="kaiju_db" value="kaiju3viruses" />
+            <param name="single_paired_selector" value="yes" />
             <param name="forward_input" value="testData_1.fasta" ftype="fasta" />
             <param name="reverse_input" value="testData_2.fasta" ftype="fasta" />
             <output name="combined_table" file="virus_table_PE_fasta.tabular" ftype="tabular" />
@@ -126,8 +147,19 @@
 Tobacco etch virus                         12227                21                            19 Potyvirus                0                           0
 ================================== ============= ================= ============================= ========== =============== ===========================
 
-The command line tool offers additional options not currently exposed
-in Galaxy, including::
+The second most important output, which you can optionally capture
+for use within Galaxy, is a per-read table summarising matches found
+with Kraken and/or Kaiju. The Kodoja Retrieve tool is not currently
+available within Galaxy, but you can instead use this file directly
+within Galaxy to filter out just the virus reads, or even reads
+matched to a specific taxid. See for example ``seq_filter_by_id``
+which is available via the Galaxy Tool Shed:
+
+http://toolshed.g2.bx.psu.edu/view/peterjc/seq_filter_by_id
+https://github.com/peterjc/pico_galaxy/tree/master/tools/seq_filter_by_id
+
+The Kodoja Search command line tool offers additional options not
+currently exposed in Galaxy, including::
 
                             Number of threads
       -s, --host_subset     Subset host sequences before Kaiju
@@ -145,7 +177,6 @@
       -i KAIJU_MISMATCH, --kaiju_mismatch KAIJU_MISMATCH
                             Kaju allowed mismatches
 
-
 For more information, please see the Kodoja manual
 https://github.com/abaizan/kodoja/wiki/Kodoja-Manual
     ]]></help>
diff -r ee917702dbd8 -r d4111d1de76f test-data/read_table_PE_fastq.tabular
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/read_table_PE_fastq.tabular	Fri Sep 14 09:55:56 2018 -0400
@@ -0,0 +1,95 @@
+kraken_classified	Seq_ID	kraken_tax_ID	kraken_seq_tax	kaiju_classified	kaiju_tax_ID	kaiju_seq_tax	combined_result
+C	SRR3466597.2160184	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1867187	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1714296	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.979054	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1842453	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1967334	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.881543	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.2337588	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1545177	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1972168	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.431651	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	U	0		
+C	SRR3466597.1360962	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1276425	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.833605	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	U	0		
+C	SRR3466597.1371609	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.899074	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.2102827	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.847861	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1902260	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.29276	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	SRR3466597.1001991	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	C	12227	d__Viruses|f__Potyviridae|g__Potyvirus|s__Tobacco_etch_virus	12227.0
+C	ERR996011.39031	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.157056	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.182572	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.250248	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.278646	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.296484	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.304884	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.319320	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.335413	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.340106	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.354526	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.433744	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.436007	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.526546	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.605463	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.625574	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.840514	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.904946	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.940698	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.972900	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1057660	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1202493	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1221866	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1225250	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1248576	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1254369	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1270424	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996011.1371856	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	C	946046	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Ugandan_cassava_brown_streak_virus	946046.0
+C	ERR996013.13602	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.32029	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.75116	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.134143	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.138713	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.173891	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.193314	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.194974	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.198787	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.236824	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.351799	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.372913	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.376059	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.453686	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.484483	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.489616	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.497754	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.515914	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.518430	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.656197	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.656523	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.692538	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.696477	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.738638	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.747299	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.752745	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.756913	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.793496	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.804840	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.860827	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.909965	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.937909	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.947899	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.967303	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.994308	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1066941	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1134829	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1154101	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1172801	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1177982	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1222223	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1249443	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1295292	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1301772	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
+C	ERR996013.1308814	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	C	137758	d__Viruses|f__Potyviridae|g__Ipomovirus|s__Cassava_brown_streak_virus	137758.0
diff -r ee917702dbd8 -r d4111d1de76f tool-data/kraken_databases.loc.sample
--- a/tool-data/kraken_databases.loc.sample	Mon Sep 10 09:16:13 2018 -0400
+++ b/tool-data/kraken_databases.loc.sample	Fri Sep 14 09:55:56 2018 -0400
@@ -1,6 +1,7 @@
 # This is a tab-separated file listing any Kraken databases
 # installed locally to offer via Galaxy.
 #
+# Expect three columns, tab separated, as follows:
 # - Column 1 - value, the key which Galaxy will record in DB
 # - Column 2 - name, the text caption which Galaxy show users
 # - Column 3 - path, the directory name (which will contain
@@ -12,3 +13,12 @@
 # kodoja at https://doi.org/10.5281/zenodo.1406071
 #
 # kodojaDB_v1.0_kraken(tab)KodojaDB v1.0 (kraken), Sept 2018(tab)/mnt/shared/data/kodojaDB_v1.0/krakenDB
+#
+# Also, for backward compatibility with early versions of the
+# Galaxy wrapper for Kraken, the Kodoja wrapper will also
+# accept three columns as follows:
+# - Column 1 - value, the key which Galaxy will record in DB
+# - Column 2 - name, final part of folder name, which Galaxy
+#   will show the user in the drop down lists to choose from
+# - Column 3 - path, parent folder name where $value/$name
+#   is the folder containing ``database.idx`` etc.
diff -r ee917702dbd8 -r d4111d1de76f tool_data_table_conf.xml.sample
--- a/tool_data_table_conf.xml.sample	Mon Sep 10 09:16:13 2018 -0400
+++ b/tool_data_table_conf.xml.sample	Fri Sep 14 09:55:56 2018 -0400
@@ -6,7 +6,7 @@
         <columns>value, name, path</columns>
         <file path="tool-data/kraken_databases.loc" />
     </table>
-    <!-- Locations of Kaiju databses -->
+    <!-- Locations of Kaiju databases -->
     <!-- This is intended to match any kaiju-only wrapper -->
     <table name="kaiju_databases" comment_char="#">
         <columns>value, name, path</columns>
diff -r ee917702dbd8 -r d4111d1de76f tool_data_table_conf.xml.test
--- a/tool_data_table_conf.xml.test	Mon Sep 10 09:16:13 2018 -0400
+++ b/tool_data_table_conf.xml.test	Fri Sep 14 09:55:56 2018 -0400
@@ -6,7 +6,7 @@
         <columns>value, name, path</columns>
         <file path="${__HERE__}/test-data/kraken_databases.loc" />
     </table>
-    <!-- Locations of Kaiju databses -->
+    <!-- Locations of Kaiju databases -->
     <!-- This is intended to match any kaiju-only wrapper -->
     <table name="kaiju_databases" comment_char="#">
         <columns>value, name, path</columns>