From: amwaterhouse <amwaterhouse@issues.jalview.org>
Date: Thu, 3 Nov 2005 11:12:28 +0000 (+0000)
Subject: Application data has choice of data or dataRef
X-Git-Tag: Release_0.2~434
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5fb0ffd7883f1723b9461a318c107b64a24de3f3;hp=3507be9b3515184a36445c4dcef9d389b3958041;p=vamsas.git

Application data has choice of data or dataRef

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

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index e02b96c..26b9bd1 100644
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -151,25 +151,31 @@
 	</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:string"/>
+				<xs:element name="dataReference" type="xs:base64Binary"/>
+			</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>
diff --git a/schemas/vamsasDocument.xsd b/schemas/vamsasDocument.xsd
index c56a41b..17547c7 100644
--- a/schemas/vamsasDocument.xsd
+++ b/schemas/vamsasDocument.xsd
@@ -18,7 +18,7 @@
                 </xs:element>
                 <xs:element ref="vamsas:Provenance" minOccurs="0" maxOccurs="1"/>
                 <xs:element ref="vamsas:VAMSAS" minOccurs="1" maxOccurs="unbounded"/>
-                <xs:element ref="vamsas:ApplicationData" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="vamsas:ApplicationData" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>