--- a/segemehl.xml	Thu Feb 05 08:25:13 2015 -0500
+++ b/segemehl.xml	Fri Dec 16 07:37:24 2016 -0500
@@ -1,14 +1,21 @@
-<tool id="segemehl" name="segemehl" version="0.1.6.0">
+<tool id="segemehl" name="segemehl" version="0.2.0">
     <description>based short read aligner</description>
     <requirements>
-        <requirement type="package" version="0.1.6">segemehl</requirement>
+        <requirement type="package" version="0.2.0">segemehl</requirement>
     </requirements>
+    <stdio>
+        <regex match="Exit forced"
+           source="both"
+           level="fatal"
+           description="Execution halted." />
+    </stdio>
     <command>
 <![CDATA[
         ## prepare segemehl index if no reference genome is supplied
-        temp_index = `mktemp`;
         #if $refGenomeSource.genomeSource == "history":
-            segemehl.x -x $temp_index -d $refGenomeSource.own_reference_genome;
+            mkdir ./temp_index/ &&
+	    #set $temp_index = './temp_index/temp.idx'
+	    segemehl.x -x $temp_index -d $refGenomeSource.own_reference_genome &&
         #else:
             #set $temp_index = $refGenomeSource.index.fields.index_path
         #end if
@@ -20,8 +27,11 @@
         ## number of threads
         -t "\${GALAXY_SLOTS:-12}"
 
-        ## db file path
-        -d ${refGenomeSource.index.fields.db_path}
+        #if $refGenomeSource.genomeSource == "history":
+	    -d $refGenomeSource.own_reference_genome
+        #else:
+            -d ${refGenomeSource.index.fields.db_path}
+        #end if
 
         -i $temp_index
 
@@ -29,8 +39,8 @@
         #if str( $library.type ) == "single":
             #set $query_list = list()
             ## prepare inputs
-            #for $fastq in $library.reads:
-                $query_list.append('%s' %($fastq.input_query))
+            #for $fastq in $library.input_query:
+                $query_list.append('%s' % $fastq )
             #end for
             -q "#echo ' '.join( $query_list )#"
         #else
@@ -61,18 +71,21 @@
         $autoclip
         $hardclip
         $order
+	$splits
+        #if $maxout:
+            --maxout $maxout
+        #end if
         -s
-        -o $segemehl_out
+
+        --minsplicecover $minsplicecover
+        --minfragscore $minfragscore
+        --minfraglen $minfraglen
+        --splicescorescale $splicescorescale
+
+        -o '$segemehl_out'
 ]]>
     </command>
-    <stdio>
-        <regex match="Exit forced"
-           source="both"
-           level="fatal"
-           description="Execution halted." />
-    </stdio>
     <inputs>
-
         <conditional name="refGenomeSource">
           <param name="genomeSource" type="select" label="Will you select a reference genome from your history or use a built-in index?" help="Built-ins were indexed using default options">
             <option value="indexed">Use a built-in index</option>
@@ -92,22 +105,20 @@
             </param>
           </when>  <!-- build-in -->
           <when value="history">
-            <param name="own_reference_genome" type="data" format="fasta" metadata_name="dbkey" label="Select the reference genome" />
+              <param name="own_reference_genome" type="data" format="fasta" label="Select the reference genome" />
           </when>  <!-- history -->
         </conditional>  <!-- refGenomeSource -->
 
-
         <conditional name="library">
             <param name="type" type="select" label="Is this library paired-end?">
                 <option value="single">Single-end</option>
                 <option value="paired">Paired-end</option>
             </param>
             <when value="single">
-                <repeat name="reads" title="FASTQ/FASTA files">
-                    <param name="input_query" type="data" format="fastqsanger,fastqillumina,fastq,fasta" label="Reads fasta/fastq file" />
-                </repeat>
+                <param name="input_query" type="data" multiple="True" format="fastqsanger,fastqillumina,fastq,fasta" label="Reads in FASTQ/FASTA files" />
             </when>
             <when value="paired">
+                <!-- ToDo paired coolections -->
                 <repeat name="mate_list" title="Paired End Pairs" min="1">
                     <param name="first_strand_query" type="data" format="fastqsanger,fastqillumina,fastq,fasta" label="Reads from first strand" />
                     <param name="second_strand_query" type="data" format="fastqsanger,fastqillumina,fastq,fasta" label="Reads from second strand" />
@@ -116,28 +127,43 @@
             </when>
         </conditional>
 
+        <param name="minsplicecover" type="integer" value="80" label="Min coverage for spliced transcripts" help="(--minsplicecover)" />
+        <param name="minfragscore" type="integer" value="18" label="Min coverage for spliced transcripts" help="(--minfragscore)" />
+        <param name="minfraglen" type="integer" value="20" label="Min length of a spliced fragment" help="(--minfraglen)" />
+        <param name="splicescorescale" type="float" value="1.0" label="Report spliced alignment with score greater than this scale times the score"
+            help="Report only if this value x score is larger than next best spliced alignment (--splicescorescale)" />
 
-        <param name="minsize" type="integer" value="12" size="5" label="Minimum size of queries" help="default: 12 (-m)">
-            <validator type="in_range" min="1"/>
-        </param>
-        <param name="accuracy" type="integer" value="85" size="5" label="Min percentage of matches per read in semi-global alignment" help="default: 85 (-A)" >
-            <validator type="in_range" min="1" max="100"/>
-        </param>
+        <param name="minsize" type="integer" value="12" min="1" label="Minimum size of queries" help="(-m)" />
+
+        <param name="maxout" type="integer" min="0" value="0" optional="True" 
+            label="Maximum number of alignments that will be reported" help="(--maxout)" />
+        <param name="accuracy" type="integer" value="85" min="1" max="100" label="Min percentage of matches per read in semi-global alignment" help="(-A)" />
+
         <param name="hitstrategy" type="select" label="Hits to report?" help="(-H)">
             <option value="1">report only best scoring hits</option>
             <option value="0">report all scoring hits</option>
         </param>
-        <param name="prime5" type="text" size="80" label="add 5' adapter" help="default: none (-Q)" />
-        <param name="prime3" type="text" size="80" label="add 3' adapter" help="default: none (-P)"/>
+        <param name="prime5" type="text" label="add 5' adapter" help="default: none (-Q)" />
+        <param name="prime3" type="text" label="add 3' adapter" help="default: none (-P)"/>
         <param name="polyA" type="boolean" truevalue="--polyA" falsevalue="" checked="false" label="Clip polyA tail" help="(-T)"/>
         <param name="autoclip" type="boolean" truevalue="--autoclip" falsevalue="" checked="false" label="Autoclip unknown 3prime adapter" help="(-Y)"/>
-        <param name="hardclip" type="boolean" truevalue="--hardclip" falsevalue="" checked="false" label="Enable hard clipping" help="-C"/>
+        <param name="hardclip" type="boolean" truevalue="--hardclip" falsevalue="" checked="false" label="Enable hard clipping" help="(-C)"/>
         <param name="order" type="boolean" truevalue="--order" falsevalue="" checked="false" label="Sorts the output by chromsome and position" help="(-O)"/>
+        <param name="splits" type="boolean" truevalue="--splits" falsevalue="" checked="false" label="Detect split/spliced reads" help="(--splits)"/>
     </inputs>
-
     <outputs>
         <data format="sam" name="segemehl_out" label="Read alignments on ${on_string}"/>
     </outputs>
+    <tests>
+      <test>
+	<param name="genomeSource" value="history" />
+        <param name="own_reference_genome" value="chr1.fa" />
+	<param name="library" value="single" />
+	<param name="input_query" value="test.fastq" />	
+	<param name="splits" value="true" />
+        <output name="segemehl_out" file="testmap.sam" lines_diff="2" />
+      </test>
+    </tests>
     <help>
 <![CDATA[