Commit bc8d6467 authored by Matthias Bernt's avatar Matthias Bernt
Browse files

XSD: break recursion in collection data

parent 8b8791a6

lib/galaxy/tool_util/xsd/galaxy.xsd

+14 −3
Original line number Diff line number Diff line
@@ -5827,9 +5827,20 @@ on Human (hg18)``. 
    <xs:attributeGroup ref="OutputDataAttributes"/>

  </xs:complexType>



  <!-- Allowed tags included in collection-data -->

  <xs:group name="OutputCollectionDataElement">

    <xs:choice>

      <xs:element name="discover_datasets" type="OutputCollectionDiscoverDatasets" />

      <xs:element name="filter" type="OutputFilter" />

      <xs:element name="actions" type="Actions" />

      <xs:element name="change_format" type="ChangeFormat" />

    </xs:choice>

  </xs:group>



  <!-- Allowed tags included in collection -->

  <xs:group name="OutputCollectionElement">

    <xs:choice>

      <xs:element name="data" type="OutputCollectionDataElement" />

      <xs:element name="data" type="OutputCollectionData" />

      <xs:element name="discover_datasets" type="OutputCollectionDiscoverDatasets" />

      <xs:element name="filter" type="OutputFilter" />

      <xs:element name="actions" type="Actions" />
@@ -5837,7 +5848,7 @@ on Human (hg18)``. 
    </xs:choice>

  </xs:group>



  <xs:complexType name="OutputCollectionDataElement">

  <xs:complexType name="OutputCollectionData">

    <xs:annotation>

      <xs:documentation xml:lang="en"><![CDATA[
@@ -5846,7 +5857,7 @@ define the elements of a collection statically. See also [Planemo's documentatio 
]]></xs:documentation>

    </xs:annotation>

    <xs:sequence>

      <xs:group ref="OutputCollectionElement" minOccurs="0" maxOccurs="unbounded" />

      <xs:group ref="OutputCollectionDataElement" minOccurs="0" maxOccurs="unbounded" />

    </xs:sequence>

    <xs:attributeGroup ref="OutputCommon" />

    <xs:attributeGroup ref="OutputDataAttributes" />