Mercurial > repos > iuc > bcftools_query

changeset 12:c9c5718edc19 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/bcftools commit 8ad854180e3be0934cdb1f0021886199a2edf9c3"
author iuc
date Fri, 05 Feb 2021 19:36:36 +0000
parents 4eb04768cd49
children 3b1b51e1fcba
files macros.xml
diffstat 1 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/macros.xml	Wed Dec 25 12:36:37 2019 -0500
+++ b/macros.xml	Fri Feb 05 19:36:36 2021 +0000
@@ -436,11 +436,19 @@
 #end if
   </token>
 
+  <xml name="macro_include_exclude_validate_sanitize">
+    <validator type="expression" message="Single quote or trailing backslash not allowed">"'" not in value and value[-1] != "\\"</validator>
+    <sanitizer>
+      <valid initial="string.ascii_letters,string.digits,string.whitespace,string.punctuation">
+        <remove value="@" />
+        <remove value="'" />
+      </valid>
+    </sanitizer>
+  </xml>
 
   <xml name="macro_include">
     <param argument="--include" type="text" optional="true" label="Include" help="Select sites for which the expression is true">
-        <validator type="regex" message="Single quote not allowed">^[^']*$</validator>
-        <sanitizer sanitize="False"/>
+      <expand macro="macro_include_exclude_validate_sanitize" />
     </param>
   </xml>
   <token name="@INCLUDE@">
@@ -448,11 +456,10 @@
   --include '${section.include}'
 #end if
   </token>
-
+  
   <xml name="macro_exclude">
     <param argument="--exclude" type="text" optional="true" label="Exclude" help="Exclude sites for which the expression is true">
-        <validator type="regex" message="Single quote not allowed">^[^']*$</validator>
-        <sanitizer sanitize="False"/>
+      <expand macro="macro_include_exclude_validate_sanitize" />
     </param>
   </xml>
   <token name="@EXCLUDE@">