Provenance must contain 1 entry, Alignment may have multiple AlignmentAnnotations

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@54 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index d259b25..de83645 100644 (file)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -14,8 +14,8 @@
        <xs:element name="Tree">
                <xs:complexType>
                        <xs:sequence>
-                               <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                               <xs:element name="newick" minOccurs="1" maxOccurs="unbounded">
+                               <xs:element name="title" type="xs:string" minOccurs="0"/>
+                               <xs:element name="newick" maxOccurs="unbounded">
                                        <xs:complexType>
                                                <xs:simpleContent>
                                                        <xs:extension base="xs:string">
@@ -25,7 +25,7 @@
                                                </xs:simpleContent>
                                        </xs:complexType>
                                </xs:element>
-                               <xs:element ref="vamsas:Provenance" minOccurs="1" maxOccurs="1"/>
+                               <xs:element ref="vamsas:Provenance"/>
                        </xs:sequence>
                        <xs:attribute name="id" type="xs:ID" use="optional"/>
                </xs:complexType>
@@ -33,7 +33,7 @@
        <xs:element name="Provenance">
                <xs:complexType>
                        <xs:sequence>
-                               <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
+                               <xs:element name="entry" maxOccurs="unbounded">
                                        <xs:complexType>
                                                <xs:sequence>
                                                        <xs:element name="User" type="xs:string"/>
@@ -75,7 +75,7 @@
                                                        <xs:element name="description" type="xs:string" minOccurs="0"/>
                                                        <xs:element name="status" type="xs:string" minOccurs="0"/>
                                                        <xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>
-                                                       <xs:element ref="vamsas:Provenance" minOccurs="0" maxOccurs="unbounded"/>
+                                                       <xs:element ref="vamsas:Provenance" maxOccurs="unbounded"/>
                                                </xs:sequence>
                                                <xs:attribute name="type" type="xs:string" use="required"/>
                                                <xs:attribute name="end" type="xs:string" use="required"/>
@@ -87,7 +87,7 @@
                                <xs:element name="Alignment" minOccurs="0" maxOccurs="unbounded">
                                        <xs:complexType>
                                                <xs:sequence>
-                                                       <xs:element name="AlignmentAnnotations" minOccurs="0">
+                                                       <xs:element name="AlignmentAnnotations" minOccurs="0" maxOccurs="unbounded">
                                                                <xs:complexType>
                                                                        <xs:sequence>
                                                                                <xs:element ref="vamsas:annotationElement" maxOccurs="unbounded"/>
@@ -100,7 +100,7 @@
                                                                </xs:complexType>
                                                        </xs:element>
                                                        <xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
-                                                       <xs:element name="alignmentSequence" minOccurs="2" maxOccurs="unbounded">
+                                                       <xs:element name="alignmentSequence" maxOccurs="unbounded">
                                                                <xs:complexType>
                                                                        <xs:complexContent>
                                                                                <xs:extension base="vamsas:SequenceType">
@@ -118,7 +118,7 @@
                                        </xs:complexType>
                                </xs:element>
                                <xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
-                               <xs:element ref="vamsas:Provenance" minOccurs="1" maxOccurs="unbounded"/>
+                               <xs:element ref="vamsas:Provenance"/>
                        </xs:sequence>
                        <xs:attribute name="id" type="xs:ID" use="optional"/>
                </xs:complexType>
@@ -126,16 +126,16 @@
        <xs:element name="annotationElement">
                <xs:complexType>
                        <xs:sequence>
-                               <xs:element name="displayCharacter" type="xs:string" maxOccurs="1" minOccurs="0"/>
-                               <xs:element name="description" type="xs:string" maxOccurs="1" minOccurs="0"/>
-                               <xs:element name="secondaryStructure" maxOccurs="1" minOccurs="0">
+                               <xs:element name="displayCharacter" type="xs:string" minOccurs="0"/>
+                               <xs:element name="description" type="xs:string" minOccurs="0"/>
+                               <xs:element name="secondaryStructure" minOccurs="0">
                                        <xs:simpleType>
                                                <xs:restriction base="xs:string">
                                                        <xs:length value="1"/>
                                                </xs:restriction>
                                        </xs:simpleType>
                                </xs:element>
-                               <xs:element name="value" type="xs:float" maxOccurs="1" minOccurs="0"/>
+                               <xs:element name="value" type="xs:float" minOccurs="0"/>
                        </xs:sequence>
                        <xs:attribute name="position" type="xs:int" use="required"/>
                        <xs:attribute name="id" type="xs:ID" use="optional"/>
@@ -143,8 +143,8 @@
        </xs:element>
        <xs:complexType name="SequenceType">
                <xs:sequence>
-                       <xs:element name="sequence" type="xs:string" maxOccurs="1" minOccurs="1"/>
-                       <xs:element name="name" type="xs:string" maxOccurs="1" minOccurs="1"/>
+                       <xs:element name="sequence" type="xs:string"/>
+                       <xs:element name="name" type="xs:string"/>
                </xs:sequence>
                <xs:attribute name="start" type="xs:int" use="required"/>
                <xs:attribute name="end" type="xs:int" use="required"/>
@@ -155,7 +155,7 @@
                                <xs:element name="Application" minOccurs="0" maxOccurs="unbounded">
                                        <xs:complexType>
                                                <xs:sequence>
-                                                       <xs:element name="User" minOccurs="1" maxOccurs="unbounded">
+                                                       <xs:element name="User" maxOccurs="unbounded">
                                                                <xs:complexType>
                                                                        <xs:attribute name="fullname" type="xs:string"/>
                                                                        <xs:attribute name="organization" type="xs:string"/>