From 879632fe7e4344d69c6474ce54c6e796ec7be9ef Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 1 Jun 2017 15:25:43 +0200
Subject: [PATCH] update COC XSD

---
 .../VectoCore/Resources/XSD/VectoCOC.xsd      | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/VectoCore/VectoCore/Resources/XSD/VectoCOC.xsd b/VectoCore/VectoCore/Resources/XSD/VectoCOC.xsd
index a3294f7311..4f9f45c6ee 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoCOC.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoCOC.xsd
@@ -299,6 +299,7 @@
 					<xs:documentation>P150</xs:documentation>
 				</xs:annotation>
 			</xs:element>
+			<xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="SimulationParametersType">
@@ -310,7 +311,6 @@
 	<xs:complexType name="VectoOutputDataType">
 		<xs:sequence>
 			<xs:element name="Vehicle" type="VehicleType"/>
-			<xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
 			<xs:element name="ResultDataSignature" type="vdecdef:SignatureType"/>
 			<xs:element name="Results">
 				<xs:complexType>
@@ -417,27 +417,32 @@
 	<xs:complexType name="ResultType">
 		<xs:sequence>
 			<xs:element name="Mission" type="MissionTypeType"/>
-			<xs:element name="Payload">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="MassUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="FuelType" type="vdecdef:FuelTypeType"/>
-			<xs:element name="AverageSpeed">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded"/>
-			<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded"/>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="Payload">
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="MassUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="FuelType" type="vdecdef:FuelTypeType"/>
+					<xs:element name="AverageSpeed">
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded"/>
+					<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:element name="Error"/>
+			</xs:choice>
 		</xs:sequence>
 		<xs:attribute name="status" use="required">
 			<xs:simpleType>
-- 
GitLab