X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fvamsas15_9.xsd;h=dd12108aafb8dd39b46ea40736a5709f74d3d33c;hb=2e92d5449226c6b2423129d779977df26fe74ec6;hp=1a5ba63fe66a117916913d941bf0db39efb3e885;hpb=c062fe4c183d567877484f0229631dc555ddc9f5;p=vamsas.git

diff --git a/schemas/vamsas15_9.xsd b/schemas/vamsas15_9.xsd
index 1a5ba63..dd12108 100644
--- a/schemas/vamsas15_9.xsd
+++ b/schemas/vamsas15_9.xsd
@@ -13,33 +13,44 @@
 			<xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="vamsas:SequenceSet" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
-		<xs:attribute name="id" type="xs:ID"/>
+		<xs:attribute name="id" type="xs:ID"  minOccurs="0" maxOccurs="1"/>
     </xs:complexType>
     <xs:element name="Tree">
 	 	<xs:complexType>
 	        <xs:sequence>
-    			<xs:element name="newickFormat" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
+	        	<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+    			<xs:element name="newick" minOccurs="1" maxOccurs="unbounded">
+    			  <xs:complexType>
+    			  <xs:simpleContent>
+    			  <xs:extension base="xs:string">
+    			  <xs:attribute name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        		  <xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
+    			  </xs:extension>
+    			  </xs:simpleContent>
+    			  </xs:complexType>
+    			</xs:element>
         		<xs:element ref="vamsas:Provenance" minOccurs="1" maxOccurs="1"/>
 		    </xs:sequence>
-        	<xs:attribute name="id" type="xs:ID"/>
+        	<xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
     	</xs:complexType>
 	</xs:element>
 	<xs:element name="Provenance">
 		<xs:complexType>
-			<xs:sequence maxOccurs="unbounded">
-				<xs:element name="entry">
+			<xs:sequence>
+				<xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
 					<xs:complexType>
 						<xs:sequence>
 							<xs:element name="User" type="xs:string"/>
 							<xs:element name="Action" type="xs:string"/>
 							<xs:element name="Date" type="xs:date"/>
 						</xs:sequence>
-					<xs:attribute name="id" type="xs:ID"/>
+						<xs:attribute name="id" type="xs:ID"  minOccurs="0" maxOccurs="1"/>
 					</xs:complexType>
 				</xs:element>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+
 	<xs:element name="SequenceSet">
 		<xs:complexType>
 			<xs:sequence>
@@ -47,6 +58,17 @@
 					<xs:complexType>
 						<xs:complexContent>
 							<xs:extension base="vamsas:SequenceType">
+								<xs:sequence>
+								    <xs:element name="dbRef" minOccurs="0" maxOccurs="unbounded">
+									<xs:complexType>
+										<xs:attribute name="source"/>
+										<xs:attribute name="version"/>
+										<xs:attribute name="accessionId"/>
+										<xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
+									</xs:complexType>
+									</xs:element>
+								</xs:sequence>
+								<xs:attribute name="id" type="xs:ID" minOccurs="1" maxOccurs="1"/>
 								<xs:attribute name="dictionary" type="xs:string"/>
 							</xs:extension>
 						</xs:complexContent>
@@ -58,13 +80,13 @@
 							<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"/>
+							<xs:element ref="vamsas:Provenance" minOccurs="0" maxOccurs="unbounded"/>
 						</xs:sequence>
 						<xs:attribute name="type" type="xs:string" use="required"/>
 						<xs:attribute name="end" type="xs:string" use="required"/>
 						<xs:attribute name="begin" type="xs:string" use="required"/>
 						<xs:attribute name="seqRef" type="xs:IDREF" use="required"/>
-						<xs:attribute name="id" type="xs:ID"/>
+						<xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
 					</xs:complexType>
 				</xs:element>
 				<xs:element name="Alignment" minOccurs="0" maxOccurs="unbounded">
@@ -79,7 +101,7 @@
 										<xs:element ref="vamsas:Provenance"/>
 									</xs:sequence>
 									<xs:attribute name="graph" type="xs:boolean" use="required"/>
-									<xs:attribute name="id" type="xs:ID"/>
+									<xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
 								</xs:complexType>
 							</xs:element>
 							<xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
@@ -87,6 +109,7 @@
 								<xs:complexType>
 									<xs:complexContent>
 										<xs:extension base="vamsas:SequenceType">
+											<xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
 											<xs:attribute name="refid" type="xs:IDREF" use="required"/>
 										</xs:extension>
 									</xs:complexContent>
@@ -94,6 +117,7 @@
 							</xs:element>
 							<xs:element ref="vamsas:Provenance"/>
 						</xs:sequence>
+						<xs:attribute name="id" type="xs:ID" minOccurs="0" maxOccurs="1"/>
 					</xs:complexType>
 				</xs:element>
 				<xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
@@ -101,7 +125,7 @@
 			</xs:sequence>
 			<xs:attribute name="gapChar" type="xs:string" use="required"/>
 			<xs:attribute name="aligned" type="xs:boolean" use="optional"/>
-			<xs:attribute name="id" type="xs:ID"/>
+			<xs:attribute name="id" type="xs:ID"  minOccurs="0" maxOccurs="1"/>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="annotationElement">
@@ -119,34 +143,34 @@
 				<xs:element name="value" type="xs:float"/>
 			</xs:sequence>
 			<xs:attribute name="position" type="xs:int" use="required"/>
-			<xs:attribute name="id" type="xs:ID"/>
+			<xs:attribute name="id" type="xs:ID"  minOccurs="0" maxOccurs="1"/>
 		</xs:complexType>
 	</xs:element>
     <xs:complexType name="SequenceType">
 		<xs:sequence>
 			<xs:element name="sequence" type="xs:string"/>
 			<xs:element name="name" type="xs:string"/>
-			<xs:element name="dbRef" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:attribute name="source"/>
-					<xs:attribute name="version"/>
-					<xs:attribute name="accessionId"/>
-					<xs:attribute name="id" type="xs:ID"/>
-				</xs:complexType>
-			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="start" type="xs:int" use="required"/>
 		<xs:attribute name="end" type="xs:int" use="required"/>
-		<xs:attribute name="id" type="xs:ID"/>
 	</xs:complexType>
 	
     <xs:complexType name="ApplicationData">
 		<xs:sequence>
 			<xs:element name="Application">
 				<xs:complexType>
+					<xs:sequence>
+					  <xs:element name="User">
+					  <xs:complexType>
+					  	<xs:attribute name="fullname" type="xs:string"/>
+					  	<xs:attribute name="organization" type="xs:string"/>
+					  	<xs:attribute name="data" type="xs:string"/>
+					  </xs:complexType>
+					  </xs:element>
+					</xs:sequence>
 					<xs:attribute name="version" type="xs:string"/>
 					<xs:attribute name="name" type="xs:string"/>
-					<xs:attribute name="session" type="xs:string"/>
+					<xs:attribute name="urn" type="xs:string"/>
 					<xs:attribute name="data" type="xs:string"/>
 				</xs:complexType>
 			</xs:element>