From c9a9cc248e0cf633c8ed1d95dc874480934f0efa Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Tue, 3 Jul 2018 15:24:31 +0200 Subject: [PATCH] adding file to project, adding type info to xml elements --- VECTO_XML-Schema.spp | 1 + .../VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd | 8 ++++---- .../Resources/XSD/VectoOutputManufacturer.0.5.xsd | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/VECTO_XML-Schema.spp b/VECTO_XML-Schema.spp index 8b84fe0f81..ac1cd50ce1 100644 --- a/VECTO_XML-Schema.spp +++ b/VECTO_XML-Schema.spp @@ -22,6 +22,7 @@ <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoEngineeringInput.0.7.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoInput.1.0.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.4.xsd" HomeFolder="Yes"/> + <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.5.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.4.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.5.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd index e595344194..dcab80c7a9 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.5.xsd @@ -62,7 +62,7 @@ <xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded"/> <xs:element name="CO2" type="CO2Type" maxOccurs="unbounded"/> </xs:sequence> - <xs:element name="Error"/> + <xs:element name="Error" type="xs:string"/> </xs:choice> </xs:sequence> <xs:attribute name="status" use="required"> @@ -96,8 +96,8 @@ <xs:element name="ApplicationInformation"> <xs:complexType> <xs:sequence> - <xs:element name="SimulationToolVersion"/> - <xs:element name="Date"/> + <xs:element name="SimulationToolVersion" type="xs:string"/> + <xs:element name="Date" type="vdecdef:DateTimeWithTimezone"/> </xs:sequence> </xs:complexType> </xs:element> @@ -112,7 +112,7 @@ <xs:element name="Model" type="vdecdef:ModelType"/> <xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/> <xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/> - <xs:element name="VIN"> + <xs:element name="VIN" type="vdecdef:VINType"> <xs:annotation> <xs:documentation>P238</xs:documentation> </xs:annotation> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd index dd4a63930d..f362e8302d 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd @@ -23,10 +23,10 @@ </xs:element> <xs:complexType name="AirdragType"> <xs:sequence> - <xs:element name="Model" minOccurs="0"/> + <xs:element name="Model" type="vdecdef:ModelType" minOccurs="0"/> <xs:element name="CertificationMethod" type="AirdragCertificationOptionType"/> - <xs:element name="CertificationNumber" minOccurs="0"/> - <xs:element name="DigestValue" minOccurs="0"/> + <xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/> + <xs:element name="DigestValue" type="xs:token" minOccurs="0"/> <xs:element name="CdxA" type="vdecdef:AirdragCdxAType"> <xs:annotation> <xs:documentation>P245</xs:documentation> -- GitLab