Mercurial > repos > estrain > srst2v2

changeset 7:0f2a700712ef draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author estrain
date Sat, 18 May 2019 19:46:40 -0400
parents 1f4a2e7eea51
children 3a0554ef7cc2
files srst2v2.xml
diffstat 1 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/srst2v2.xml	Sat May 18 19:32:27 2019 -0400
+++ b/srst2v2.xml	Sat May 18 19:46:40 2019 -0400
@@ -1,4 +1,4 @@
-<tool id="srst2" name="SRST2 - Short Read Sequence Typer (v2)" version="0.2.3">
+<tool id="srst2" name="SRST2 - Short Read Sequence Typer (v2)" version="0.2.0">
     <requirements>
         <requirement type="package" version="0.2.0">srst2</requirement>
     </requirements>
@@ -6,6 +6,9 @@
         #if $paired_conditional.sPaired == "paired"
            ln -s $paired_conditional.fastq1 sample_1.fastq;
            ln -s $paired_conditional.fastq2 sample_2.fastq;
+        #else if $paired_conditional.sPaired == "paired_coll" 
+           ln -s $paired_conditional.coll.forward sample_1.fastq;
+           ln -s $paired_conditional.coll.reverse sample_2.fastq;
         #end if
 
         srst2
@@ -14,6 +17,8 @@
             --input_se $paired_conditional.fastq1
         #else if $paired_conditional.sPaired == "paired"
             --input_pe sample_1.fastq sample_2.fastq
+        #else if $paired_conditional.sPaired == "paired_coll"
+            --input_pe sample_1.fastq sample_2.fastq
         #end if
 
         --output srst2out 
@@ -76,8 +81,9 @@
     <inputs>
       <conditional name="paired_conditional">
         <param name="sPaired" type="select" label="Single-End or Paired-End FASTQ?">
-          <option value="single">Single-end</option>
-          <option value="paired">Paired-end</option>
+          <option value="single">Single FASTQ</option>
+          <option value="paired">Forward and Reverse FASTQ</option>
+          <option value="paired_coll">Paired FASTQ Collection</option>
         </param>
         <when value="single">
           <param name="fastq1" type="data" format="fastq,fastqsanger" label="FASTQ file" help="FASTQ" />
@@ -86,12 +92,15 @@
           <param name="fastq1" type="data" format="fastq,fastqsanger" label="Forward FASTQ file" help="FASTQ" />
           <param name="fastq2" type="data" format="fastq,fastqsanger" label="Reverse FASTQ file" help="FASTQ" />
         </when>
+        <when value="paired_coll">
+          <param name="coll" label="Paired FASTQ" type="data_collection" format="fastq,fastqsanger" collection_type="paired" />
+        </when>
       </conditional>
 
       <conditional name="job_type">
-        <param name="job" type="select" label="MLST or Gene Presence/Absence?">
+        <param name="job" type="select" label="MLST, MLST with ST, or Gene Presence/Absence?">
           <option value="nost">MLST</option>
-          <option value="mlst">MLST with ST</option>
+          <option value="mlst">MLST with ST Definitions</option>
           <option value="gene">Gene</option>
         </param>
         <when value="nost">