X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fvamsas.xsd;h=1a0409512f1cd00098ed8dd6ed2400d3f6ce4b49;hb=0d8d07c7087a1e54114a1ce503ba65f0ede3aac0;hp=de836456c8858c87877deda691edc65a5feb3303;hpb=acd3e0997c5f35a4594db7947075b1df86d87a2c;p=vamsas.git

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index de83645..1a04095 100644
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -56,9 +56,9 @@
 								<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="source" type="xs:string"/>
+											<xs:attribute name="version" type="xs:string"/>
+											<xs:attribute name="accessionId" type="xs:string"/>
 											<xs:attribute name="id" type="xs:ID" use="optional"/>
 										</xs:complexType>
 									</xs:element>
@@ -78,8 +78,8 @@
 							<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"/>
-						<xs:attribute name="begin" type="xs:string" use="required"/>
+						<xs:attribute name="end" type="xs:integer" use="required"/>
+						<xs:attribute name="begin" type="xs:integer" use="required"/>
 						<xs:attribute name="seqRef" type="xs:IDREF" use="required"/>
 						<xs:attribute name="id" type="xs:ID" use="optional"/>
 					</xs:complexType>
@@ -137,7 +137,7 @@
 				</xs:element>
 				<xs:element name="value" type="xs:float" minOccurs="0"/>
 			</xs:sequence>
-			<xs:attribute name="position" type="xs:int" use="required"/>
+			<xs:attribute name="position" type="xs:integer" use="required"/>
 			<xs:attribute name="id" type="xs:ID" use="optional"/>
 		</xs:complexType>
 	</xs:element>
@@ -146,30 +146,36 @@
 			<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"/>
+		<xs:attribute name="start" type="xs:integer" use="required"/>
+		<xs:attribute name="end" type="xs:integer" use="required"/>
 	</xs:complexType>
 	<xs:element name="ApplicationData">
 		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Application" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="User" maxOccurs="unbounded">
-								<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" use="required"/>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="urn" type="xs:string" use="required"/>
-						<xs:attribute name="data" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
+			<xs:complexContent>
+				<xs:extension base="vamsas:appData">
+					<xs:attribute name="version" type="xs:string" use="required"/>
+					<xs:attribute name="name" type="xs:string" use="required"/>
+					<xs:attribute name="urn" type="xs:string" use="required"/>
+				</xs:extension>
+			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
+	<xs:complexType name="appData">
+		<xs:sequence>
+			<xs:choice>
+				<xs:element name="data" type="xs:base64Binary"/>
+				<xs:element name="dataReference" type="xs:string"/>
+			</xs:choice>
+			<xs:element name="User" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="vamsas:appData">
+							<xs:attribute name="fullname" type="xs:string" use="required"/>
+							<xs:attribute name="organization" type="xs:string" use="required"/>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>