--- a/antismash.xml	Sat Oct 12 09:18:04 2013 -0400
+++ b/antismash.xml	Mon Oct 14 03:26:11 2013 -0400
@@ -13,8 +13,12 @@
     </requirements>
     <command>
         #import os, glob
-        #set $outputfolder = os.path.join($html.files_path, 'antismash')
-        ln -s $infile #echo 'input_tempfile.' + $infile.ext#;
+        #set $outputfolder = $html.files_path
+        #if $infile.ext == 'genbank':
+            #set $file_extension = 'gb'
+        #end if
+
+        ln -s $infile #echo 'input_tempfile.' + $file_extension#;
         mkdir -p $outputfolder;
         run_antismash.py 
             --cpus 4
@@ -35,7 +39,7 @@
             --outputfolder $outputfolder
 
 
-            #echo 'input_tempfile.' + $infile.ext#
+            #echo 'input_tempfile.' + $file_extension#
 
             ## leave out the start and end features, it can be easily replaced with Galaxy tools
             ##--from START          Start analysis at nucleotide specified
@@ -51,13 +55,22 @@
         
         ## gene clusters
         #if 'geneclusterprots_tabular' in str($outputs).split(','):
-            cp #echo os.path.join($outputfolder, 'geneclusters.txt')# $geneclusterprots;
+            cp #echo os.path.join($outputfolder, 'geneclusters.txt')# $geneclusterprots_tabular;
         #end if
 
+        #if 'geneclusterprots_fasta' in str($outputs).split(','):
+            cp #echo os.path.join($outputfolder, '*_genecluster_proteins.fa')# $geneclusterprots_fasta;
+        #end if
+
+
         ##SVG images
         #if 'archive_svgs' in str($outputs).split(','):
             cd #echo os.path.join($outputfolder, 'svg')#;
-            tar cfz $archive_svgs *_all.svg genecluster*;   
+            #if $clusterblast:
+                tar cfz $archive_svgs *_all.svg genecluster*;
+            #else:
+                tar cfz $archive_svgs genecluster*;
+            #end if
         #end if
 
         ##all files in a archive
@@ -68,24 +81,32 @@
 
         ## genbank
         #if 'gb' in str($outputs).split(','):
-            #for $gb_file in glob.glob( os.path.join($outputfolder, '*.gbk') ):
-                cat $gb_file >> $genbank;
-            #end for
+            cat #echo os.path.join($outputfolder, '*.gbk')# > $genbank;
         #end if
 
     </command>
     <inputs>
-        <param name="infile" type="data" format="gb,embl" label="Nucleotide sequence file in GenBank or EMBL format"/>
+        <param name="infile" type="data" format="genbank" label="Nucleotide sequence file in GenBank format"/>
 
-        <param name="clusterblast" type="boolean" label="BLAST identified clusters against known clusters" truevalue="--clusterblast" falsevalue="" checked="True" />
-        <param name="smcogs" type="boolean" label="analysis of secondary metabolism gene families (smCOGs)" 
+        <param name="clusterblast" type="boolean" label="BLAST identified clusters against known clusters"
+            help="(--clusterblast)"
+            truevalue="--clusterblast" falsevalue="" checked="True" />
+        <param name="subclusterblast" type="boolean" label="Subcluster BLAST analysis"
+            help="(--subclusterblast)"
+            truevalue="--subclusterblast" falsevalue="" checked="false" />
+        <param name="smcogs" type="boolean" label="Analysis of secondary metabolism gene families (smCOGs)"
             falsevalue="" truevalue="--smcogs" checked="True" />
 
-        <param name="full_blast" type="boolean" label="Run a whole-genome BLAST analysis" truevalue="--full-blast" falsevalue="" checked="False" />
-        <param name="subclusterblast" type="boolean" label="Subcluster Blast analysis" truevalue="--subclusterblast" falsevalue="" checked="false" />
-        <param name="full_hmmer" type="boolean" label="Run a whole-genome Pfam analysis" truevalue="--full-hmmer" falsevalue="" checked="false" />
+        <param name="full_blast" type="boolean" label="Run a whole-genome BLAST analysis"
+            help="(--full-blast)"
+            truevalue="--full-blast" falsevalue="" checked="False" />
+        <param name="full_hmmer" type="boolean" label="Run a whole-genome Pfam analysis"
+            help="(--full-hmmer)"
+            truevalue="--full-hmmer" falsevalue="" checked="false" />
 
-        <param name="inclusive" type="boolean" label="Use inclusive algorithm for cluster detection" truevalue="--inclusive" falsevalue="" checked="false" />
+        <param name="inclusive" type="boolean" label="Use inclusive algorithm for cluster detection"
+            help="(--inclusive)"
+            truevalue="--inclusive" falsevalue="" checked="false" />
 
         <param name="pfam_database" type="select" optional="true" label="Pfam database" help="Pfam Covariance models">
             <options from_file="antismash.loc">
@@ -134,16 +155,16 @@
 
     </inputs>
     <outputs>
-        <data format="fasta" name="geneclusterprots" label="${tool.name} on ${on_string} (Gen Cluster Proteins)">
+        <data format="fasta" name="geneclusterprots_fasta" label="${tool.name} on ${on_string} (Gen Cluster Proteins)">
           <filter>'geneclusterprots_fasta' in outputs</filter>
         </data>
-        <data format="fasta" name="geneclusterprots" label="${tool.name} on ${on_string} (Gen Cluster Proteins)">
+        <data format="tabular" name="geneclusterprots_tabular" label="${tool.name} on ${on_string} (Gen Cluster Proteins)">
           <filter>'geneclusterprots_tabular' in outputs</filter>
         </data>
-        <data format="gzipped" name="archive" label="${tool.name} on ${on_string} (all files compressed)">
+        <data format="tar" name="archive" label="${tool.name} on ${on_string} (all files compressed)">
           <filter>'archive' in outputs</filter>
         </data>
-        <data format="gzipped" name="archive_svgs" label="${tool.name} on ${on_string} (SVG images)">
+        <data format="tar.gz" name="archive_svgs" label="${tool.name} on ${on_string} (SVG images)">
           <filter>'archive_svgs' in outputs</filter>
         </data>
         <data format="html" name="html" label="${tool.name} on ${on_string} (html report)">
@@ -165,8 +186,8 @@
 
 **Input**
 
-The ideal input for antiSMASH is an annotated nucleotide file in Genbank format or EMBL format. If no annotation is available, 
-we recommend running your sequence through an annotation pipeline like RAST are one included in Galaxy.
+The ideal input for antiSMASH is an annotated nucleotide file in Genbank format. If no annotation is available, 
+we recommend running your sequence through an annotation pipeline like RAST are the one included in Galaxy.
 
 
 There are several optional analyses that may or may not be run on your sequence.