--- a/Pathview.xml	Mon Aug 27 11:21:34 2018 -0400
+++ b/Pathview.xml	Thu Aug 30 06:12:51 2018 -0400
@@ -1,4 +1,4 @@
-<tool id="Pathview" name="KEGG pathway mapping (pathview)" version="2018.08.27">
+<tool id="Pathview" name="KEGG pathway mapping (pathview)" version="2018.08.30">
     <requirements>
         <requirement type="package" version="1.18.0">bioconductor-pathview</requirement>
     </requirements>
@@ -11,10 +11,12 @@
             --id_column="$input.ncol"
             --header="$input.header"  
         #end if
-        #if $species.pathways.pathways_id == "pathways_ids"
+        #if $species.pathways.pathways_id != "pathways_file"
             --pathways_id="$species.pathways.pids" 
         #else 
-            --pathways_id="$species.pathways.pids"
+            --pathways_input="$species.pathways.file"
+            --header2="$species.pathways.header2"
+            --pathway_col="$species.pathways.ncol2"
         #end if
         --id_type="$id_type"  
         --native_kegg="$native"
@@ -36,6 +38,10 @@
 
     ]]></command>
     <inputs>
+        <param name="id_type" type="select" label="Select your identifiers type :">
+            <option value="uniprotID">Uniprot Accession number</option>
+            <option value="geneID">Entrez gene ID</option>
+        </param>
         <conditional name="input" >
             <param name="ids" type="select" label="Provide your identifiers" help="Copy/paste or ID list from a file (e.g. table)" >
                 <option value="text">Copy/paste your identifiers</option>
@@ -55,8 +61,8 @@
             </when>
             <when value="file" >
                 <param name="file" type="data" format="txt,tabular" label="Select a file that contains your list of IDs" help="" />
-                <param name="header" type="boolean" checked="true" truevalue="true" falsevalue="false" label="Does your input file contain header?" />
-                <param name="ncol" type="text" value="c1" label="The column number of IDs to map" help='For example, fill in "c1" if it is the first column, "c2" if it is the second column and so on' />
+                <param name="header" type="boolean" checked="true" truevalue="true" falsevalue="false" label="Does your input file contains a header?" />
+                <param name="ncol" type="text" value="c1" label="The column which contains your IDs to map" help='For example, fill in "c1" if it is the first column, "c2" if it is the second column and so on' />
                 <conditional name="expression_values">
                     <param name="nb_exp" type="select" label="How many expression values column in your file ?">
                         <option value="0" >0</option>
@@ -81,11 +87,6 @@
                 </conditional>
             </when>
         </conditional>
-        <param name="id_type" type="select" label="select your identifiers type :">
-            <option value="uniprotID">Uniprot Accession number</option>
-            <option value="geneID">Entrez gene ID</option>
-        </param>
-
         <conditional name="species">
         <param name="ref_file" type="select" label="Select species" >
             <option value="hsa">Human (hsa)</option>
@@ -96,6 +97,7 @@
                 <param name="pathways_id" type="select" label="Provide your pathway(s)" help="Enter KEGG pathway name(s) or KEGG pathway id(s)">
                     <option value="pathways_names">KEGG pathway name(s)</option>
                     <option value="pathways_ids">KEGG pathway id(s)</option>
+                    <option value="pathways_file">KEGG pathway id(s) from file</option>
                 </param>
                 <when value="pathways_names">
                     <param name="pids" type="select" label="Select pathway(s)" multiple="true" help='You can select one or several pathway(s), you can write the beginning of your pathways to search using autocomplete'>
@@ -106,7 +108,7 @@
                     </param>
                 </when>
                 <when value="pathways_ids">
-                    <param name="pids" type="text" label="Copy/paste your pathway id(s)" help='IDs must be separated by "," into the form field, for example: "00010,05412" or "hsa00010,hsa05412"'>
+                    <param name="pids" type="text" label="Copy/paste your pathway id(s)" help='IDs must be separated by "," into the form field, for example: "00010,05412" or "hsa00010,hsa05412" or "path:hsa00010"'>
                         <sanitizer invalid_char=''>
                         <valid initial="string.printable">
                             <remove value="&apos;"/>
@@ -117,6 +119,11 @@
                         </sanitizer>
                     </param>
                 </when>
+                <when value="pathways_file">
+                    <param name="file" type="data" format="txt,tabular" label="Select a file with a column of pathways id" help="Pathway id format : 'path:hsa00010' or 'hsa00010' or '00010'" />
+                    <param name="header2" type="boolean" checked="true" truevalue="true" falsevalue="false" label="Does your input file contains a header?" />
+                    <param name="ncol2" type="text" value="c1" label="The column which contains your pathways ids" help='For example, fill in "c1" if it is the first column, "c2" if it is the second column and so on' />
+                </when>
                 </conditional>
             </when>
             <when value="mmu">
@@ -124,6 +131,7 @@
                 <param name="pathways_id" type="select" label="Provide your pathway(s)" help="Enter KEGG pathway name(s) or KEGG pathway id(s)">
                     <option value="pathways_names">KEGG pathway name(s)</option>
                     <option value="pathways_ids">KEGG pathway id(s)</option>
+                    <option value="pathways_file">KEGG pathway id(s) from file</option>
                 </param>
                 <when value="pathways_names">
                     <param name="pids" type="select" label="Select pathway(s)" multiple="true" help='You can select one or several pathway(s), you can write the beginning of your pathways to search using autocomplete'>
@@ -134,7 +142,7 @@
                     </param>
                 </when>
                 <when value="pathways_ids">
-                    <param name="pids" type="text" label="Copy/paste your pathway id(s)" help='IDs must be separated by "," into the form field, for example: "00010,05412" or "hsa00010,hsa05412"'>
+                    <param name="pids" type="text" label="Copy/paste your pathway id(s)" help='IDs must be separated by "," into the form field, for example: "path:mmu00053" or "mmu00053,mmu00340" or "00053"'>
                         <sanitizer invalid_char=''>
                         <valid initial="string.printable">
                             <remove value="&apos;"/>
@@ -145,6 +153,11 @@
                         </sanitizer>
                     </param>
                 </when>
+                <when value="pathways_file">
+                    <param name="file" type="data" format="txt,tabular" label="Select a file with a column of pathways id " help="Pathway id format : 'path:mmu00053' or 'mmu00053' or '00053'" />
+                    <param name="header2" type="boolean" checked="true" truevalue="true" falsevalue="false" label="Does your input file contain header?" />
+                    <param name="ncol2" type="text" value="c1" label="The column which contains your pathways ids" help='For example, fill in "c1" if it is the first column, "c2" if it is the second column and so on' />
+                </when>
                 </conditional>
             </when>
         </conditional>
@@ -194,13 +207,17 @@
     <help><![CDATA[
 This tool map a list of Uniprot Accession number or Entrez gene ID to KEGG pathway with pathview R package.
 
+Select your identifier type : UniprotAC or Entrez gene ID
+
 Select an input file containing ids in a column, set header and column number or copy/paste your ids. 
 
-Select your identifier type and a species of interest (for now only human available). 
+You can import 1 to 3 column(s) of expression values if you are importing ids from a file.
+
+Select a species of interest. 
 
-Select one or several pathways of interest from the dropdown menu or copy/paste KEGG pathway id(s)
+Select one or several pathways of interest from the dropdown menu or copy/paste KEGG pathway id(s) or import it from a file.
 
-Select the graph format : KEGG or graphviz
+Select the graph format : KEGG (jpg) or graphviz (pdf)
 
 Uniprot accession number converted to Entrez geneID or Entrez geneID are mapped to each selected pathways.