changeset 1:c1dff5c2a7b3 draft

"planemo upload commit aa6c4b1d15a2d5361d68c7eb313551bddf2700fa"

--- a/dbkit_create.xml	Tue Mar 23 23:06:15 2021 +0000
+++ b/dbkit_create.xml	Mon Mar 29 21:45:54 2021 +0000
@@ -1,4 +1,4 @@
-<tool id="ffindex_dbkit_create" name="DBKit Create" version="0.1.1" license="MIT" profile="20.01">
+<tool id="ffindex_dbkit_create" name="DBKit Create" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" license="MIT" profile="20.01">
     <description>database</description>
     <macros>
         <import>macros.xml</import>
@@ -18,6 +18,7 @@
         -il '$advanced.idlength'
         -ic '$advanced.idcase'
         -ie '$advanced.idextension'
+        -ip '$advanced.idprefix'
     ]]>    </command>
     <inputs>
         <param name="input" type="data" format="tabular" label="List of Identifiers" help="Specify a list containing all entry identifiers to be downloaded." />
@@ -28,7 +29,12 @@
                 <option value="false">No formatting</option>
             </param>
             <when value="true">
-                <param name="idextension" type="text" optional="true" label="Identifier Extensions" help="Specify the extension of the identifier" />
+                <param name="idprefix" type="text" optional="true" label="Identifier Prefix" help="Specify the prefix of the identifier">
+                    <validator type="regex" message="Please only use letters, numbers or underscores">^[a-zA-Z.]+$</validator>
+                </param>
+                <param name="idextension" type="text" optional="true" label="Identifier Extensions" help="Specify the extension of the identifier">
+                    <validator type="regex" message="Please only use letters, numbers or underscores">^[a-zA-Z.]+$</validator>
+                </param>
                 <param name="idlength" type="integer" label="Identifier Length" value="0" min="0" max="20" help="Specify the length of the identifier (disable=0)." />
                 <param name="idcase" type="select" label="Identifier Case" display="radio" help="Choose to format the identifier by changing its case (optional).">
                     <option value="">Unformatted</option>
@@ -37,6 +43,7 @@
                 </param>
             </when>
             <when value="false">
+                <param name="idprefix" type="hidden" value="" />
                 <param name="idextension" type="hidden" value="" />
                 <param name="idlength" type="hidden" value="0" />
                 <param name="idcase" type="hidden" value="" />
@@ -52,7 +59,7 @@
         </data>
     </outputs>
     <tests>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input" value="create/sequences.tabular" ftype="tabular" />
             <param name="inputs" value="create/NP_000282.1.hhr,create/NP_000290.2.hhr,create/NP_000548.2.hhr,create/NP_000836.2.hhr" />
             <conditional name="advanced">

--- a/macros.xml	Tue Mar 23 23:06:15 2021 +0000
+++ b/macros.xml	Mon Mar 29 21:45:54 2021 +0000
@@ -1,13 +1,15 @@
 <macros>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="0.1">ffindex-dbkit</requirement>
+            <requirement type="package" version="@TOOL_VERSION@">ffindex-dbkit</requirement>
             <yield />
         </requirements>
     </xml>
+    <token name="@TOOL_VERSION@">0.2</token>
+    <token name="@VERSION_SUFFIX@">0</token>
     <xml name="ffindex_single_inputs">
-        <param name="ffdata" type="data" format="ffdata" label="PDB Database" help="Database Data file." />
-        <param name="ffindex" type="data" format="ffindex" label="PDB Database Index" help="Database Index file." />
+        <param name="ffdata" type="data" format="ffdata" label="Database" help="Database Data file." />
+        <param name="ffindex" type="data" format="ffindex" label="Database Index" help="Database Index file." />
     </xml>
 
     <xml name="citations">