Mercurial > repos > wolma > mimodd

diff convert.xml @ 23:5db0545b9004 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update to v0.1.7.3
author wolma
date Thu, 21 Jul 2016 03:55:49 -0400
parents c46406466625
children
line wrap: on
line diff
--- a/convert.xml	Sun Jun 12 07:39:46 2016 -0400
+++ b/convert.xml	Thu Jul 21 03:55:49 2016 -0400
@@ -1,13 +1,13 @@
-<tool id="convert" name="Convert" version="0.1.7.2">
+<tool id="convert" name="Convert" version="0.1.7.3">
   <description>between different sequence data formats</description>
   <macros>
     <import>toolshed_macros.xml</import>
   </macros>
-  <expand macro="requirements"/>
+  <expand macro="requirements" />
   <version_command>python3 -m MiModD version -q</version_command>
   <command>
   #if $str($mode.split_on_rgs) or $str($mode.oformat)=="fastq" or $str($mode.oformat)=="gz":
-    echo "Your input data is now getting processed by MiModD. The output will be split into several files based on the read groups found in the input.\nThis history item will remain in the busy state until the job is finished.\nAfter the job is showing as finished, Galaxy will start adding the results files to your history one by one.\n\nThis may take a while to complete! \n\nYou should refresh your history to see if new files have arrived.\n\nThis message is for your information only and can be deleted from the history once the job has finished." > $output_split_on_read_groups;
+    echo "Your input data is now getting processed by MiModD. The output will be split into several files based on the read groups found in the input.\nThis history item will remain in the busy state until the job is finished.\nAfter the job is showing as finished, Galaxy will start adding the results files to your history one by one.\n\nThis may take a while to complete! \n\nYou should refresh your history to see if new files have arrived.\n\nThis message is for your information only and can be deleted from the history once the job has finished." &gt; $output_split_on_read_groups;
 
     mkdir converted_data;
   #end if
@@ -36,7 +36,7 @@
   
   <inputs>
     <conditional name="mode">
-	  <param name="iformat" type="select" label="input file format" help="Your choice will update the interface to display further choices appropriate for your type of input data.">
+	  <param help="Your choice will update the interface to display further choices appropriate for your type of input data." label="input file format" name="iformat" type="select">
 	    <option value="fastq">fastq: single-end (one file)</option>
 	    <option value="fastq_pe">fastq: paired-end (two files)</option>
 	    <option value="gz">gzip compressed fastq: single-end (one file)</option>
@@ -45,95 +45,95 @@
 	    <option value="bam">bam</option>
       </param>	
         <when value="fastq">
-	      <param name="oformat" type="select" label="output file format">
+	      <param label="output file format" name="oformat" type="select">
 	        <option value="sam">sam</option>
 	        <option value="bam">bam</option>
 	      </param>
-	      <repeat name="input_list" title="fastq input dataset" default="1" min="1">
-		    <param name="file1" format="fastq" type="data" label="inputfile"/>
+	      <repeat default="1" min="1" name="input_list" title="fastq input dataset">
+		    <param format="fastq" label="inputfile" name="file1" type="data" />
 	      </repeat>
-          <param name="header" type="data" format="sam" label="Use Header File" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file."/>
-          <param name="split_on_rgs" type="hidden" value=""/>	    
+          <param format="sam" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file." label="Use Header File" name="header" type="data" />
+          <param name="split_on_rgs" type="hidden" value="" />	    
 	    </when>
 	    <when value="fastq_pe">
-	      <param name="oformat" type="select" label="output file format">
+	      <param label="output file format" name="oformat" type="select">
 	        <option value="sam">sam</option>
 	        <option value="bam">bam</option>
 	      </param>
-	      <repeat name="input_list" title="fastq input datasets" default="1" min="1">
-		    <param format="fastq" name="file1" type="data" label="inputfile with the first set of reads of paired-end data"/>		
-		    <param format="fastq" name="file2" type="data" label="inputfile with the second set of reads of paired-end data"/>
+	      <repeat default="1" min="1" name="input_list" title="fastq input datasets">
+		    <param format="fastq" label="inputfile with the first set of reads of paired-end data" name="file1" type="data" />		
+		    <param format="fastq" label="inputfile with the second set of reads of paired-end data" name="file2" type="data" />
 	      </repeat>
-          <param name="header" type="data" format="sam" label="Use Header File" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file."/>
-          <param name="split_on_rgs" type="hidden" value=""/>
+          <param format="sam" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file." label="Use Header File" name="header" type="data" />
+          <param name="split_on_rgs" type="hidden" value="" />
 	    </when>
         <when value="gz">
-	      <param name="oformat" type="select" label="output file format">
+	      <param label="output file format" name="oformat" type="select">
 	        <option value="sam">sam</option>
 	        <option value="bam">bam</option>
 	      </param>
-	      <repeat name="input_list" title="fastq.gz input dataset" default="1" min="1">
-		    <param name="file1" format="data" type="data" label="inputfile"/>
+	      <repeat default="1" min="1" name="input_list" title="fastq.gz input dataset">
+		    <param format="data" label="inputfile" name="file1" type="data" />
 	      </repeat>
-          <param name="header" type="data" format="sam" label="Use Header File" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file."/>
-          <param name="split_on_rgs" type="hidden" value=""/>
+          <param format="sam" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file." label="Use Header File" name="header" type="data" />
+          <param name="split_on_rgs" type="hidden" value="" />
 	    </when>
 	    <when value="gz_pe">
-	      <param name="oformat" type="select" label="output file format">
+	      <param label="output file format" name="oformat" type="select">
 	        <option value="sam">sam</option>
 	        <option value="bam">bam</option>
 	      </param>
-	      <repeat name="input_list" title="fastq.gz input datasets" default="1" min="1">
-		    <param format="data" name="file1" type="data" label="inputfile with the first set of reads of paired-end data"/>		
-		    <param format="data" name="file2" type="data" label="inputfile with the second set of reads of paired-end data"/>
+	      <repeat default="1" min="1" name="input_list" title="fastq.gz input datasets">
+		    <param format="data" label="inputfile with the first set of reads of paired-end data" name="file1" type="data" />		
+		    <param format="data" label="inputfile with the second set of reads of paired-end data" name="file2" type="data" />
 	      </repeat>
-          <param name="header" type="data" format="sam" label="Use Header File" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file."/>
-          <param name="split_on_rgs" type="hidden" value=""/>
+          <param format="sam" help="A SAM file with header information, as generated, for example, by the NGS Run Annotation Tool, that will be used to attach metainformation to the results file." label="Use Header File" name="header" type="data" />
+          <param name="split_on_rgs" type="hidden" value="" />
 	    </when>
 	    <when value="sam">
-	      <param name="oformat" type="select" label="output file format">
+	      <param label="output file format" name="oformat" type="select">
 	        <option value="bam">bam</option>
 	        <option value="sam">sam</option>
 	        <option value="fastq">fastq</option>
 	        <option value="gz">gzipped fastq</option>
 	      </param>
-	      <repeat name="input_list" title="sam input dataset" default="1" min="1" max="1">
-		    <param name="file1" format="sam" type="data" label="inputfile"/>
+	      <repeat default="1" max="1" min="1" name="input_list" title="sam input dataset">
+		    <param format="sam" label="inputfile" name="file1" type="data" />
 	      </repeat>
-	      <param name="header" type="hidden" value="None"/>
-	      <param name="split_on_rgs" type="boolean" truevalue="--split-on-rgs" falsevalue="" checked="false" label="Split output based on read group IDs" help="If the input file contains reads from different read groups, write them to separate output files; implied automatically for conversions to fastq and gzipped fastq format"/>
+	      <param name="header" type="hidden" value="None" />
+	      <param checked="false" falsevalue="" help="If the input file contains reads from different read groups, write them to separate output files; implied automatically for conversions to fastq and gzipped fastq format" label="Split output based on read group IDs" name="split_on_rgs" truevalue="--split-on-rgs" type="boolean" />
 	    </when>
 	    <when value="bam">
-	      <param name="oformat" type="select" label="output file format">
+	      <param label="output file format" name="oformat" type="select">
 	        <option value="sam">sam</option>
 	        <option value="bam">bam</option>
 	        <option value="fastq">fastq</option>
 	        <option value="gz">gzipped fastq</option>
 	      </param>
-	      <repeat name="input_list" title="bam input dataset" default="1" min="1" max="1">
-		    <param name="file1" format="bam" type="data" label="inputfile"/>
+	      <repeat default="1" max="1" min="1" name="input_list" title="bam input dataset">
+		    <param format="bam" label="inputfile" name="file1" type="data" />
 	      </repeat>
-	      <param name="header" type="hidden" value="None"/>
-	      <param name="split_on_rgs" type="boolean" truevalue="--split-on-rgs" falsevalue="" checked="false" label="Split output based on read group IDs" help="If the input file contains reads from different read groups, write them to separate output files; implied automatically for conversions to fastq and gzipped fastq format"/>
+	      <param name="header" type="hidden" value="None" />
+	      <param checked="false" falsevalue="" help="If the input file contains reads from different read groups, write them to separate output files; implied automatically for conversions to fastq and gzipped fastq format" label="Split output based on read group IDs" name="split_on_rgs" truevalue="--split-on-rgs" type="boolean" />
 	    </when>
     </conditional>
   </inputs>
   
   <outputs>
-    <data name="outputname" format="bam" label="Converted reads from MiModd ${tool.name} on ${on_string}">
+    <data format="bam" label="Converted reads from MiModd ${tool.name} on ${on_string}" name="outputname">
 	  <change_format>
-	      <when input="mode.oformat" value="sam" format="sam" />
+	      <when format="sam" input="mode.oformat" value="sam" />
 	  </change_format>
 	  <filter>
 	    (not mode['split_on_rgs'] and mode['oformat'] not in ("fastq", "gz"))
 	  </filter>
     </data>
     
-    <data name="output_split_on_read_groups" format="txt" label="MiModD ${tool.name} run on ${on_string}">
+    <data format="txt" label="MiModD ${tool.name} run on ${on_string}" name="output_split_on_read_groups">
 	  <filter>
 	    (mode['split_on_rgs'] or mode['oformat'] in ("fastq", "gz"))
 	  </filter>
-	  <discover_datasets pattern="__designation_and_ext__" directory="converted_data" visible="true" />
+	  <discover_datasets directory="converted_data" pattern="__designation_and_ext__" visible="true" />
     </data>
   </outputs>
 
@@ -167,5 +167,4 @@
 .. _MiModD user guide: http://mimodd.readthedocs.org/en/latest
 
 </help>
-</tool>
-
+</tool>
\ No newline at end of file