Mercurial > repos > greg > gene_family_classifier

changeset 31:80e9d6e098ec draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Mon, 30 Jan 2017 15:22:06 -0500
parents e9d9632762ca
children 364960a5ad2c
files gene_family_classifier.xml
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gene_family_classifier.xml	Mon Jan 30 14:48:51 2017 -0500
+++ b/gene_family_classifier.xml	Mon Jan 30 15:22:06 2017 -0500
@@ -13,7 +13,6 @@
     </stdio>
     <command>
         <![CDATA[
-        	#set output_label = ""
             #if str($options_type.options_type_selector) == 'advanced':
                 #set create_orthogroup_cond = $options_type.create_orthogroup_cond
                 #set create_orthogroup = $create_orthogroup_cond.create_orthogroup
@@ -57,10 +56,7 @@
                 #if str($create_orthogroup) == 'yes':
                     --orthogroup_fasta
                     #if $create_corresponding_coding_sequences:
-                    	#set output_label = "Gene family clusters with corresponding coding sequences"
                         --coding_sequences "$create_corresponding_coding_sequences_cond.coding_sequences"
-                    #else:
-                    	#set output_label = "Gene family clusters"
                     #end if
                 #end if
             #end if
@@ -164,8 +160,11 @@
         <data name="hmmscan_log" format="txt" label="Protein classification hmmscan.log on ${on_string}">
             <filter>save_hmmscan_log_cond['classifier'] in ['hmmscan', 'both'] and save_hmmscan_log_cond['save_hmmscan_log'] == 'yes'</filter>
         </data>
-        <data name="output" format="txt" label="${output_label} on ${on_string}">
-            <filter>options_type['options_type_selector'] == 'advanced' and options_type['create_orthogroup_cond']['create_orthogroup'] == 'yes'</filter>
+        <data name="output" format="txt" label="Gene family clusters on ${on_string}">
+            <filter>options_type['options_type_selector'] == 'advanced' and options_type['create_orthogroup_cond']['create_orthogroup'] == 'yes'and options_type['create_orthogroup_cond']['create_corresponding_coding_sequences_cond']['create_corresponding_coding_sequences'] == 'no'</filter>
+        </data>
+        <data name="output" format="txt" label="Gene family clusters and corresponding coding sequences on ${on_string}">
+            <filter>options_type['options_type_selector'] == 'advanced' and options_type['create_orthogroup_cond']['create_orthogroup'] == 'yes' and options_type['create_orthogroup_cond']['create_corresponding_coding_sequences_cond']['create_corresponding_coding_sequences'] == 'yes'</filter>
         </data>
         <collection name="orthos" type="list">
             <discover_datasets pattern="__name__" directory="geneFamilyClassification_dir" visible="false" ext="tabular" />