# HG changeset patch
# User Jim Johnson <jj@umn.edu>
# Date 1390516221 21600
# Node ID fe044d480b3a506aa727763c66c4b147d9b0e45f
# Parent  30975b3ff0dc6159d1764af45c2fbacc04bd1aaa
Validate and sanitize separator parameters for annotation fields

diff -r 30975b3ff0dc -r fe044d480b3a find_in_reference.xml
--- a/find_in_reference.xml	Thu Jan 23 10:52:30 2014 -0600
+++ b/find_in_reference.xml	Thu Jan 23 16:30:21 2014 -0600
@@ -56,10 +56,30 @@
       <when value="yes">
         <param name="annotation_columns" type="data_column" data_ref="reference" multiple="true" label="columns from reference to append to found input lines" 
            help=""/>
-        <param name="annotation_separator" type="text" value="" optional="true" label="separator to place between annotations from different reference lines"
-           help="defaults to ;"/>
-        <param name="annotation_col_sep" type="text" value="" optional="true" label="separator to place between annotation columns from the same reference line"
-           help="defaults to ,"/>
+        <param name="annotation_separator" type="text" value=";" optional="true" label="separator to place between annotations from different reference lines"
+           help="defaults to ;">
+          <validator type="regex" message="Single quote character is not allowed">^[^']*$</validator>
+          <sanitizer>
+            <valid initial="string.printable">
+              <remove value="&apos;"/>
+            </valid>
+            <mapping initial="none">
+              <add source="&apos;" target=""/>
+            </mapping>
+          </sanitizer>
+        </param>
+        <param name="annotation_col_sep" type="text" value="," optional="true" label="separator to place between annotation columns from the same reference line"
+           help="defaults to ,">
+          <validator type="regex" message="Single quote character is not allowed">^[^']*$</validator>
+          <sanitizer>
+            <valid initial="string.printable">
+              <remove value="&apos;"/>
+            </valid>
+            <mapping initial="none">
+              <add source="&apos;" target=""/>
+            </mapping>
+          </sanitizer>
+        </param>
       </when>
     </conditional>
   </inputs>