--- a/tetyper.xml	Wed Nov 27 19:03:57 2019 +0000
+++ b/tetyper.xml	Fri Jan 03 20:33:19 2020 +0000
@@ -1,4 +1,4 @@
-<tool id="tetyper" name="TETyper" version="@TOOL_VERSION@+galaxy0">
+<tool id="tetyper" name="TETyper" version="@TOOL_VERSION@+galaxy1">
     <description>Transposable Element Typer</description>
     <macros>
         <token name="@TOOL_VERSION@">1.1</token>
@@ -21,11 +21,11 @@
             --min_each_strand '${min_each_strand}'
             --min_mapped_len '${min_mapped_len}'
             --min_qual '${min_qual}'
-            #if $snp_profiles
-              --snp_profiles '${snp_profiles}'
+            #if $snp_profiles_source.struct_profiles
+              --snp_profiles '${snp_profiles_source.snp_profiles}'
             #end if
-            #if $struct_profiles
-              --struct_profiles '${struct_profiles}'
+            #if $struct_profiles_source.struct_profiles
+              --struct_profiles '${struct_profiles_source.struct_profiles}'
             #end if
             --outprefix output
         ]]>
@@ -44,14 +44,46 @@
                 <param format="fastq,fastq.gz" name="reverse_input" type="data" label="Reverse strand" help="FASTQ dataset"/>
             </when>
         </conditional>
+        <conditional name="snp_profiles_source">
+            <param name="snp_profiles_source_selector" type="select" label="Select a SNP profile from your history or use one from a tool data table?"
+                   help="Screening files must be stored in the 'tetyper_snp_profiles' tool data table">
+                <option value="tool_data_table">From tool data table</option>
+                <option value="history" selected="true">From history</option>
+            </param>
+            <when value="tool_data_table">
+                <param name="snp_profiles" type="select" format="tabular">
+	            <options from_data_table="tetyper_snp_profiles">
+	                <validator type="no_options" message="No TETyper SNP profiles are available" />
+                    </options>
+	        </param>
+            </when>
+            <when value="history">
+                <param name="snp_profiles" type="data" format="tabular" label="SNP Profile" help="A three-column tabular file with SNP profile definitions" optional="true"/>
+            </when>
+        </conditional>
+        <conditional name="struct_profiles_source">
+            <param name="struct_profiles_source_selector" type="select" label="Select a structural variant profile from your history or use one from a tool data table?"
+                   help="Files must be stored in the 'tetyper_struct_profiles' tool data table">
+                <option value="tool_data_table">From tool data table</option>
+                <option value="history" selected="true">From history</option>
+            </param>
+            <when value="tool_data_table">
+                <param name="struct_profiles" type="select" format="tabular">
+	            <options from_data_table="tetyper_struct_profiles">
+	                <validator type="no_options" message="No TETyper structural variant profiles are available" />
+                    </options>
+	        </param>
+            </when>
+            <when value="history">
+                <param name="struct_profiles" type="data" format="tabular" label="Structural Variant Profile" help="A two-column tabular file with structural variant profile definitions" optional="true"/>
+            </when>
+        </conditional>
         <param name="reference" type="data" format="fasta" label="Transposable Element Reference"/>
         <param name="flank_length" type="integer" min="4" value="5" max="16" label="Flank Length" help="Length of flanking region to extract."/>
         <param name="min_reads" type="integer" min="1" value="10" max="100" label="Minimum Reads" help="Minimum read number for including a specific flanking sequence."/>
         <param name="min_each_strand" type="integer" min="1" value="1" max="100" label="Minimum Reads (each strand)" help="Minimum read number for each strand for including a specific flanking sequence."/>
         <param name="min_mapped_len" type="integer" min="8" value="30" max="100" label="Minimum Mapped Length" help="Minimum length of mapping for a read to be used in determining flanking sequences. Higher values are more robust to spurious mapping. Lower values will recover more reads."/>
         <param name="min_qual" type="integer" min="0" value="10" max="100" label="Minimum quality" help="Minimum quality value across extracted flanking sequence." />
-        <param name="snp_profiles" type="data" format="text" label="SNP Profiles" optional="true" />
-        <param name="struct_profiles" type="data" format="text" label="Structural Variant Profiles" optional="true" />
         <param name="include_log" type="boolean" label="Include log in output"/>
     </inputs>
     <outputs>