From 3c2a5a1b33d2d33db162c0b15099f745e3e17a36 Mon Sep 17 00:00:00 2001 From: hutzsc01 <Daniel.Hutzschenreuter@ptb.de> Date: Thu, 9 Mar 2023 09:41:31 +0100 Subject: [PATCH] Cleaned XML and examples plus some minor additions to XSD --- SI_Format.xsd | 27 +++++++++++++++---- .../BRONZE/2020-03-20-UM-BRONZE-examples.xml | 8 +++--- .../2021-11-22-BRONZE-examples-xmllists.xml | 4 +-- .../BRONZE/2022-05-23-BRONZE-examples.xml | 4 +-- examples/BRONZE/PTB-BRONZE-examples-2.xml | 6 ++--- examples/BRONZE/PTB-BRONZE-examples.xml | 6 ++--- examples/GOLD/2020-03-20-UM-GOLD-examples.xml | 8 +++--- .../2021-10-26-GOLD-examples-xmllists.xml | 4 +-- examples/GOLD/2022-05-23-GOLD-examples.xml | 4 +-- examples/GOLD/PTB-GOLD-examples-2.xml | 6 ++--- examples/GOLD/PTB-GOLD-examples.xml | 6 ++--- examples/GOLD/gold-test.xml | 6 ++--- .../2020-03-20-UM-IMPROVABLE-examples.xml | 2 +- ...021-11-23-IMPROVABLE-examples-xmllists.xml | 6 ++--- .../2022-05-23-IMPROVABLE-examples.xml | 6 ++--- .../IMPROVABLE/PTB-IMPROVABLE-examples-2.xml | 6 ++--- .../IMPROVABLE/PTB-IMPROVABLE-examples.xml | 6 ++--- examples/IMPROVABLE/improvable-test.xml | 6 ++--- examples/NOT PASSED/UM58-D-SI-example.xml | 6 ++--- examples/NOT PASSED/UM59-D-SI-example.xml | 6 ++--- examples/NOT PASSED/UM60-D-SI-example.xml | 6 ++--- .../2020-03-20-UM-PLATINUM-examples.xml | 8 +++--- .../2021-10-26-PLATINUM-examples-xmllists.xml | 4 +-- .../PLATINUM/2022-05-23-PLATINUM-examples.xml | 4 +-- examples/PLATINUM/PTB-PLATINUM-examples-2.xml | 6 ++--- examples/PLATINUM/PTB-PLATINUM-examples.xml | 6 ++--- examples/PLATINUM/platinum-test.xml | 6 ++--- .../SILVER/2020-03-20-UM-SILVER-examples.xml | 6 ++--- .../2021-11-22-SILVER-examples-xmllists.xml | 6 ++--- .../SILVER/2022-05-23-SILVER-examples.xml | 6 ++--- examples/SILVER/PTB-SILVER-examples-2.xml | 6 ++--- examples/SILVER/PTB-SILVER-examples.xml | 6 ++--- examples/SILVER/silver-test.xml | 6 ++--- 33 files changed, 113 insertions(+), 96 deletions(-) diff --git a/SI_Format.xsd b/SI_Format.xsd index 10bd135..e0d9bae 100644 --- a/SI_Format.xsd +++ b/SI_Format.xsd @@ -244,7 +244,7 @@ <xs:element name="valueStandardMU" type="si:valueStandardMUType" minOccurs="0"/> <!-- deprecated element standardUnc: use valueStandardMU instead --> - <xs:element name="standardUnc" type="si:uncertaintyValueType" minOccurs="0"/> + <xs:element name="uncertainty" type="si:uncertaintyValueType" minOccurs="0"/> <!-- optional distribution --> <xs:element name="distribution" type="xs:string" minOccurs="0"/> @@ -459,6 +459,11 @@ </xs:documentation> </xs:annotation> </xs:element> + <xs:element name="listUnivariateUnc" type="si:listUnivariateUncType" minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated element] use listMeasurementUncertaintyUnivariate instead</xs:documentation> + </xs:annotation> + </xs:element> <!-- mandatory list of real elements --> <xs:element name="real" type="si:realInListType" maxOccurs="unbounded"> @@ -528,6 +533,17 @@ </xs:complexType> + <xs:complexType name="listUnivariateUncType"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated type] use listMeasurementUncertaintyUnivariateType instead</xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element name="expandedUnc" type="si:expandedUncType"/> + <xs:element name="coverageInterval" type="si:coverageIntervalType"/> + </xs:choice> + </xs:complexType> + + <xs:element name="realListXMLList" type="si:realListXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -953,6 +969,7 @@ <xs:element name="realListXMLList" type="si:realListXMLListType"/> <!-- or list of complex --> <xs:element name="complexList" type="si:complexListType"/> + <xs:element name="complexListXMLList" type="si:complexListXMLListType"/> <!-- or list of lists --> <xs:element name="list" type="si:listType"/> </xs:choice> @@ -1342,7 +1359,7 @@ <xs:element name="expandedUnc" type="si:expandedUncType"> <xs:annotation> <xs:documentation xml:lang="en"> - Definition of the structure, that gives the necessary components for stating + [deprectated element] Definition of the structure, that gives the necessary components for stating an expanded measurement uncertainty. This element must always be used in the context of a real quantity, which is an application within si:real and/or si:globalUnivariateUnc. @@ -1367,7 +1384,7 @@ <xs:element name="coverageInterval" type="si:coverageIntervalType"> <xs:annotation> <xs:documentation xml:lang="en"> - Definition of the structure, that gives the necessary components for stating + [deprectated element] Definition of the structure, that gives the necessary components for stating a probabilistic-symmetric coverage interval for a real uncertainty. This element must always be used in the context of a real quantity, which is an application within si:real and/or si:globalUnivariateUnc. @@ -1414,7 +1431,7 @@ <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"> <xs:annotation> <xs:documentation xml:lang="en"> - Definition of the structure, that provides a hyper-ellipsoidal coverage + [deprectated element] Definition of the structure, that provides a hyper-ellipsoidal coverage region for stating the uncertainty of multivariate quantities. It is used in the context of uncertainty for complex quantities and lists of real or complex quantities. @@ -1436,7 +1453,7 @@ <xs:element name="rectangularRegion" type="si:rectangularRegionType"> <xs:annotation> <xs:documentation xml:lang="en"> - Definition of the structure that provides a hyper-rectangular coverage + [deprectated element] Definition of the structure that provides a hyper-rectangular coverage region for stating the uncertainty of multivariate quantities. It is used in the context of uncertainty for complex quantities and lists of real or complex quantities. diff --git a/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml b/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml index a657ef9..bea3393 100644 --- a/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml +++ b/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation=" https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml b/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml index 697c902..548e2c8 100644 --- a/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml +++ b/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/2022-05-23-BRONZE-examples.xml b/examples/BRONZE/2022-05-23-BRONZE-examples.xml index bdacc7a..da818dd 100644 --- a/examples/BRONZE/2022-05-23-BRONZE-examples.xml +++ b/examples/BRONZE/2022-05-23-BRONZE-examples.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd" > + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd" > <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/PTB-BRONZE-examples-2.xml b/examples/BRONZE/PTB-BRONZE-examples-2.xml index d86d211..34cd4ea 100644 --- a/examples/BRONZE/PTB-BRONZE-examples-2.xml +++ b/examples/BRONZE/PTB-BRONZE-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/PTB-BRONZE-examples.xml b/examples/BRONZE/PTB-BRONZE-examples.xml index 1e858bf..a6b159a 100644 --- a/examples/BRONZE/PTB-BRONZE-examples.xml +++ b/examples/BRONZE/PTB-BRONZE-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml index 1c79fa3..39b343e 100644 --- a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml +++ b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml b/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml index 9c72b65..bd6b993 100644 --- a/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml +++ b/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/2022-05-23-GOLD-examples.xml b/examples/GOLD/2022-05-23-GOLD-examples.xml index 92bc971..60e13e6 100644 --- a/examples/GOLD/2022-05-23-GOLD-examples.xml +++ b/examples/GOLD/2022-05-23-GOLD-examples.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/PTB-GOLD-examples-2.xml b/examples/GOLD/PTB-GOLD-examples-2.xml index 4c415e8..65dab88 100644 --- a/examples/GOLD/PTB-GOLD-examples-2.xml +++ b/examples/GOLD/PTB-GOLD-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/PTB-GOLD-examples.xml b/examples/GOLD/PTB-GOLD-examples.xml index 7ec1d66..a1f3ea1 100644 --- a/examples/GOLD/PTB-GOLD-examples.xml +++ b/examples/GOLD/PTB-GOLD-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/gold-test.xml b/examples/GOLD/gold-test.xml index d86a52a..826516f 100644 --- a/examples/GOLD/gold-test.xml +++ b/examples/GOLD/gold-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml index 2bff6da..f9bff52 100644 --- a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml +++ b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml @@ -3,7 +3,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. diff --git a/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml b/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml index 37ad5d4..04731d3 100644 --- a/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml +++ b/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml index 87e139a..3e014e7 100644 --- a/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml +++ b/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml index e96daac..b8044fd 100644 --- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml +++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml index 0d26015..e178915 100644 --- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml +++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/improvable-test.xml b/examples/IMPROVABLE/improvable-test.xml index 9a1d0b9..f33c3fa 100644 --- a/examples/IMPROVABLE/improvable-test.xml +++ b/examples/IMPROVABLE/improvable-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/NOT PASSED/UM58-D-SI-example.xml b/examples/NOT PASSED/UM58-D-SI-example.xml index dff4bd3..00c451f 100644 --- a/examples/NOT PASSED/UM58-D-SI-example.xml +++ b/examples/NOT PASSED/UM58-D-SI-example.xml @@ -1,10 +1,10 @@ <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/NOT PASSED/UM59-D-SI-example.xml b/examples/NOT PASSED/UM59-D-SI-example.xml index 2467e3e..a86ea64 100644 --- a/examples/NOT PASSED/UM59-D-SI-example.xml +++ b/examples/NOT PASSED/UM59-D-SI-example.xml @@ -1,10 +1,10 @@ <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/NOT PASSED/UM60-D-SI-example.xml b/examples/NOT PASSED/UM60-D-SI-example.xml index d46cdfd..d5b26f1 100644 --- a/examples/NOT PASSED/UM60-D-SI-example.xml +++ b/examples/NOT PASSED/UM60-D-SI-example.xml @@ -1,10 +1,10 @@ <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml b/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml index 67b5817..82e66f2 100644 --- a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml +++ b/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml index e61f351..b654406 100644 --- a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml +++ b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml b/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml index 34f0843..e437904 100644 --- a/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml +++ b/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/PTB-PLATINUM-examples-2.xml b/examples/PLATINUM/PTB-PLATINUM-examples-2.xml index 2af89b3..42376be 100644 --- a/examples/PLATINUM/PTB-PLATINUM-examples-2.xml +++ b/examples/PLATINUM/PTB-PLATINUM-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/PTB-PLATINUM-examples.xml b/examples/PLATINUM/PTB-PLATINUM-examples.xml index 1cbd774..0e7354a 100644 --- a/examples/PLATINUM/PTB-PLATINUM-examples.xml +++ b/examples/PLATINUM/PTB-PLATINUM-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 10.5281/zenodo.4709001 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/platinum-test.xml b/examples/PLATINUM/platinum-test.xml index cc58fc7..4531757 100644 --- a/examples/PLATINUM/platinum-test.xml +++ b/examples/PLATINUM/platinum-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml b/examples/SILVER/2020-03-20-UM-SILVER-examples.xml index a446bae..a541c01 100644 --- a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml +++ b/examples/SILVER/2020-03-20-UM-SILVER-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml index 2a4e72c..08c8bbd 100644 --- a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml +++ b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/2022-05-23-SILVER-examples.xml b/examples/SILVER/2022-05-23-SILVER-examples.xml index c957137..301cdf3 100644 --- a/examples/SILVER/2022-05-23-SILVER-examples.xml +++ b/examples/SILVER/2022-05-23-SILVER-examples.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/PTB-SILVER-examples-2.xml b/examples/SILVER/PTB-SILVER-examples-2.xml index e83fcf3..bde3a8d 100644 --- a/examples/SILVER/PTB-SILVER-examples-2.xml +++ b/examples/SILVER/PTB-SILVER-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/PTB-SILVER-examples.xml b/examples/SILVER/PTB-SILVER-examples.xml index d1b477d..dfc296b 100644 --- a/examples/SILVER/PTB-SILVER-examples.xml +++ b/examples/SILVER/PTB-SILVER-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/silver-test.xml b/examples/SILVER/silver-test.xml index 88fcdd7..380eea3 100644 --- a/examples/SILVER/silver-test.xml +++ b/examples/SILVER/silver-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify -- GitLab