Mercurial > repos > galaxyp > percolator

diff nested_collection.xml @ 2:7a0951d0e13e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tools/percolator commit 4ca7fcd1587c906db3314048a223d23b63b3f038
author galaxyp
date Fri, 10 Mar 2017 03:20:52 -0500
parents 86770eea5b09
children abed51712ed0
line wrap: on
line diff
--- a/nested_collection.xml	Sat Mar 04 20:36:03 2017 -0500
+++ b/nested_collection.xml	Fri Mar 10 03:20:52 2017 -0500
@@ -1,4 +1,4 @@
-<tool id="batched_set_list_creator" name="Create nested list" version="3.0.1">
+<tool id="batched_set_list_creator" name="Create nested list" version="3.1">
     <description>based on filenames and batch sizes</description>
     <stdio>
         <exit_code range="1:" />
@@ -32,7 +32,7 @@
     </inputs>
     <outputs>
         <collection name="batched_fractions" type="list:list" label="Pooled batched data">
-          <discover_datasets pattern="[a-zA-z0-9_]*___(?P&lt;identifier_0&gt;[^_]+)_(?P&lt;identifier_1&gt;[^_]+)\.mzid" ext="mzid" visible="true" />
+          <discover_datasets pattern="(?P&lt;identifier_0&gt;\w+[^_][^_][^_])___(?P&lt;identifier_1&gt;[^_]+)\.mzid" ext="mzid" visible="true" />
         </collection>
     </outputs>
     <tests>
@@ -47,11 +47,11 @@
                 </collection>
             </param>
             <output_collection name="batched_fractions" type="list:list">
-                <element name="batch0">
+                <element name="pool0_batch0">
                     <element name="inputfn0" file="empty_file1.mzid"/>
                     <element name="inputfn1" file="empty_file2.mzid"/>
                 </element>
-                <element name="batch1">
+                <element name="pool0_batch1">
                     <element name="inputfn0" file="empty_file3.mzid"/>
                     <element name="inputfn1" file="empty_file4.mzid"/>
                 </element>
@@ -75,12 +75,12 @@
                 </collection>
             </param>
             <output_collection name="batched_fractions" type="list:list">
-                <element name="batch0">
+                <element name="set1_batch0">
                     <element name="inputfn0" file="empty_file1.mzid"/>
                     <element name="inputfn1" file="empty_file2.mzid"/>
                     <element name="inputfn2" file="empty_file3.mzid"/>
                 </element>
-                <element name="batch1">
+                <element name="set2_batch1">
                     <element name="inputfn0" file="empty_file4.mzid"/>
                     <element name="inputfn1" file="empty_file5.mzid"/>
                     <element name="inputfn2" file="empty_file6.mzid"/>
@@ -106,18 +106,18 @@
                 </collection>
             </param>
             <output_collection name="batched_fractions" type="list:list">
-                <element name="batch0">
+                <element name="set1_batch0">
                     <element name="inputfn0" file="empty_file1.mzid"/>
                     <element name="inputfn1" file="empty_file2.mzid"/>
                 </element>
-                <element name="batch1">
+                <element name="set1_batch1">
                     <element name="inputfn0" file="empty_file3.mzid"/>
                 </element>
-                <element name="batch2">
+                <element name="set2_batch2">
                     <element name="inputfn0" file="empty_file4.mzid"/>
                     <element name="inputfn1" file="empty_file5.mzid"/>
                 </element>
-                <element name="batch3">
+                <element name="set2_batch3">
                     <element name="inputfn0" file="empty_file6.mzid"/>
                 </element>
             </output_collection>