Commit 0c50f443 authored by Matthias Bernt's avatar Matthias Bernt
Browse files

xsd fixes for output actions 

- `when` tags can contain `action` and `conditional` (i.e.
  `ActionsElement` and not only `Action`)
  https://github.com/galaxyproject/galaxy/blob/f1f16517e6384f680ebbcea0f0ffb2b871a3d36c/lib/galaxy/tool_util/parser/output_actions.py#L46

- `strip` is a string
  https://github.com/galaxyproject/galaxy/blob/f1f16517e6384f680ebbcea0f0ffb2b871a3d36c/lib/galaxy/tool_util/parser/output_actions.py#L481

- iterate attribute was missing

all used for instance here:

used for instance here: https://github.com/bgruening/galaxytools/blob/c27a05e92e6e03545903dd2ff90976f8cab5ebf7/tools/text_processing/text_processing/cut.xml#L69
parent ca1d2f57

lib/galaxy/tool_util/xsd/galaxy.xsd

+11 −3
Original line number Diff line number Diff line
@@ -5699,7 +5699,8 @@ of this directive. 
      ]]></xs:documentation>

    </xs:annotation>

    <xs:sequence>

      <xs:element name="action" type="Action" minOccurs="1" maxOccurs="unbounded"/>

      <xs:group ref="ActionsElement" minOccurs="1" maxOccurs="unbounded"/>

      <!-- <xs:element name="action" type="Action" minOccurs="1" maxOccurs="unbounded"/> -->

    </xs:sequence>

    <xs:attribute name="value" type="xs:string" use="optional">

      <xs:annotation>
@@ -5823,6 +5824,13 @@ Applies to ``param_value``, ``boolean``</xs:documentation> 
        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="iterate" type="PermissiveBoolean">

      <xs:annotation>

        <xs:documentation xml:lang="en"><![CDATA[

Applies to ``insert_column``. Default is ``False``</xs:documentation>

        ]]></xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="param_attribute" type="xs:string">

      <xs:annotation>

        <xs:documentation xml:lang="en">
@@ -5835,9 +5843,9 @@ Applies to ``param_value``</xs:documentation> 
        <xs:documentation xml:lang="en">Applies to ``multiple_splitter``</xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="strip" type="PermissiveBoolean">

    <xs:attribute name="strip" type="xs:string">

      <xs:annotation>

        <xs:documentation xml:lang="en">Applies to ``column_strip``</xs:documentation>

        <xs:documentation xml:lang="en">Applies to ``column_strip``. The given string is removed from the start or end of the column.</xs:documentation>

      </xs:annotation>

    </xs:attribute>

    <xs:attribute name="old_column" type="xs:string">