From 873554c9a9cc1371daf0f4f21fa959bca23555bf Mon Sep 17 00:00:00 2001
From: hutzsc01 <Daniel.Hutzschenreuter@ptb.de>
Date: Thu, 30 Nov 2023 12:46:42 +0100
Subject: [PATCH] finalization D-SI 2.2.0
---
CHANGELOG.md | 9 ++--
README.md | 8 ++--
SI_Format.xsd | 20 +++++----
examples/GOLD/2020-03-20-UM-GOLD-examples.xml | 6 +--
examples/GOLD/2022-05-23-GOLD-examples.xml | 6 +--
examples/GOLD/PTB-GOLD-examples-2.xml | 8 ++--
examples/GOLD/PTB-GOLD-examples.xml | 6 +--
.../2020-03-20-UM-IMPROVABLE-examples.xml | 10 +++--
...021-11-23-IMPROVABLE-examples-xmllists.xml | 8 ++--
.../2022-05-23-IMPROVABLE-examples.xml | 8 ++--
.../IMPROVABLE/PTB-IMPROVABLE-examples-2.xml | 8 ++--
.../IMPROVABLE/PTB-IMPROVABLE-examples.xml | 8 ++--
examples/IMPROVABLE/improvable-test.xml | 6 +--
examples/NOT PASSED/UM58-D-SI-example.xml | 2 +-
examples/NOT PASSED/UM59-D-SI-example.xml | 2 +-
examples/NOT PASSED/UM60-D-SI-example.xml | 2 +-
.../2020-03-20-UM-PLATINUM-examples.xml | 6 +--
.../2021-10-26-PLATINUM-examples-xmllists.xml | 6 +--
.../PLATINUM/2022-05-23-PLATINUM-examples.xml | 6 +--
.../2023-03-31-PLATINUM-examples-1.xml | 6 +--
examples/PLATINUM/PTB-PLATINUM-examples-2.xml | 8 ++--
examples/PLATINUM/PTB-PLATINUM-examples.xml | 8 ++--
examples/PLATINUM/platinum-test.xml | 6 +--
examples/SI-Accelaration-examples.xml | 6 +--
.../SILVER/2020-03-20-UM-SILVER-examples.xml | 6 +--
.../2021-11-22-SILVER-examples-xmllists.xml | 8 ++--
.../SILVER/2022-05-23-SILVER-examples.xml | 8 ++--
examples/SILVER/PTB-SILVER-examples-2.xml | 6 +--
examples/SILVER/PTB-SILVER-examples.xml | 8 ++--
examples/SILVER/silver-test.xml | 6 +--
examples/SI_Format_TestData.xsd | 12 +++--
examples/SmartCom_A1.2.3_examples.xml | 10 ++---
qudt/quantityKind.xsd | 11 -----
qudt/quantitykind.xsd | 44 +++++++++++++++++++
34 files changed, 163 insertions(+), 125 deletions(-)
delete mode 100644 qudt/quantityKind.xsd
create mode 100644 qudt/quantitykind.xsd
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6532b98..148967d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,20 @@
-## 2023-05-12
+## 2023-11-30
+
+Documentation of all updates [>> Wiki](wiki/doc/UnitSystem.md)
* Added feature si:quantityTypeQUDT (identification of kinds of quantities)
* Extended and improved structures for representation of measurement uncertainties
* Added feature si:standardMU (standard measurement uncertainty)
* Added feature NaN values (placeholders)
* Added unit operator /per
+* Added XML list representation for complex quantity values
* Improved documentation of k value and distribution usage
* Added feature si:significantDigit
* Cleaned up XSD
+* New list of all unit identifiers [>> units list](wiki/doc/UnitSystem.md)
-* Update of Wiki with page providing all unit identifiers [>> units Wiki](wiki/doc/UnitSystem.md)
## 2022-11-30
* Update of units representation system with new SI prefixes and dimension one units
-* Update of Wiki with page providing all unit identifiers [>> units Wiki](wiki/doc/UnitSystem.md)
+* Update of Wiki with page providing all unit identifiers
diff --git a/README.md b/README.md
index c70c0ba..aba882b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
<div align="center">
<a href="https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si" traget="_blank"><img src="wiki/doc/D-SI1.PNG" alt="D-SI Logo" width="500"/></a>
<br />
- XSD Version 2.1.0
+ XSD Version 2.2.0
<br /><br />
</div>
@@ -40,13 +40,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## Access to D-SI XSD version 2.1.0
+## Access to D-SI XSD version 2.2.0
-* D-SI XSD version 2.1.0 @ [https://www.ptb.de/si/v2.0.0/SI_Format.xsd](https://www.ptb.de/si/v2.1.0/SI_Format.xsd)
+* D-SI XSD version 2.2.0 @ [https://www.ptb.de/si/v2.2.0/SI_Format.xsd](https://www.ptb.de/si/v2.2.0/SI_Format.xsd)
* Latest D-SI XSD version @ [https://www.ptb.de/si/SI_Format.xsd](https://www.ptb.de/si/SI_Format.xsd)
-* XSD for D-SI example files [https://www.ptb.de/si/v2.0.0/examples/SI_Format_TestData.xsd](https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd)
+* XSD for D-SI example files [https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd](https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd)
## Development
diff --git a/SI_Format.xsd b/SI_Format.xsd
index 7f563bf..25599b6 100644
--- a/SI_Format.xsd
+++ b/SI_Format.xsd
@@ -24,8 +24,8 @@
CONTACT: daniel.hutzschenreuter@ptb.de
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
- D-SI XSD VERSION: 2.2.0-beta
- RELEASE DATA: 2023-MM-DD
+ D-SI XSD VERSION: 2.2.0
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
</xs:documentation>
<xs:documentation xml:lang="en">
@@ -34,13 +34,13 @@
This project (17IND02) has received funding from the EMPIR programme, co-financed by the Participating States and
from the European Union's Horizon 2020 research and innovation programme.
Further development was supported by project GEMIMEG II and PTB.
- Finlly, thanks to all developpers from PTB and our partners around the world for fruitful exchange on requirements
+ Finally, thanks to all developpers from PTB and our partners around the world for fruitful exchange on requirements
and updates.
</xs:documentation>
</xs:annotation>
<!-- Importing used namespaces, TODO: change from local to web schema location before release -->
- <xs:import namespace="http://qudt.org/vocab/" schemaLocation="qudt/quantityKind.xsd"/>
+ <xs:import namespace="http://qudt.org/vocab/" schemaLocation="https://www.ptb.de/si/v2.2.0/qudt/quantitykind.xsd"/>
@@ -1094,7 +1094,7 @@
</xs:annotation>
</xs:element>
- <xs:element name="quantityTypeQUDT" substitutionGroup="si:quantityType" type="qudt:quantityKind">
+ <xs:element name="quantityTypeQUDT" substitutionGroup="si:quantityType" type="qudt:quantitykind">
<xs:annotation>
<xs:documentation xml:lang="en">
Definition of a quantity element that links to the QUDT
@@ -1388,8 +1388,10 @@
<xs:simpleType name="significantDigitType">
<xs:annotation>
<xs:documentation xml:lang="en">
- Type providing number of significant digitis
- with separation by blank spaces.
+ Type providing information on the significat digit of si:value.
+ This integer number represents the exponent of a power of 10
+ which identifies the ISO 80000 rounding range of the significant
+ digit. .
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer"/>
@@ -1399,8 +1401,8 @@
<xs:simpleType name="significantDigitXMLListType">
<xs:annotation>
<xs:documentation xml:lang="en">
- Type providing number of significant digitis
- with separation by blank spaces.
+ Type for identification of significant digiti for XML list style elements.
+ The significant digit numbers are seperated by blank spaces.
</xs:documentation>
</xs:annotation>
<xs:list itemType="si:significantDigitType"/>
diff --git a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml
index 39b343e..9e9895a 100644
--- a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml
+++ b/examples/GOLD/2020-03-20-UM-GOLD-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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved.
@@ -11,7 +11,7 @@
Authors: Bojan Acko, Rok Klobucar
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM4">
diff --git a/examples/GOLD/2022-05-23-GOLD-examples.xml b/examples/GOLD/2022-05-23-GOLD-examples.xml
index 7ca98e0..d593382 100644
--- a/examples/GOLD/2022-05-23-GOLD-examples.xml
+++ b/examples/GOLD/2022-05-23-GOLD-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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
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 65dab88..e05c333 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
diff --git a/examples/GOLD/PTB-GOLD-examples.xml b/examples/GOLD/PTB-GOLD-examples.xml
index a1f3ea1..16bcdf0 100644
--- a/examples/GOLD/PTB-GOLD-examples.xml
+++ b/examples/GOLD/PTB-GOLD-examples.xml
@@ -6,12 +6,12 @@
xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB7">
diff --git a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml
index f9bff52..d026927 100644
--- a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml
+++ b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml
@@ -3,15 +3,17 @@
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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
+ Errors 15
+
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-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +29,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM2">
diff --git a/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml b/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml
index 04731d3..bd777f7 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0-RC1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB638">
diff --git a/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml
index ffc5523..a8fce38 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples including quantity type for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0-RC1)</siTest:testDescription>
+ <siTest:testDescription>XML examples including quantity type for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB702">
diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml
index b8044fd..2faf32e 100644
--- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml
+++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml
@@ -3,15 +3,17 @@
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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
+ Errors 45
+
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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +29,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB502">
diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml
index e178915..1512a14 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB17">
diff --git a/examples/IMPROVABLE/improvable-test.xml b/examples/IMPROVABLE/improvable-test.xml
index f33c3fa..00d0c05 100644
--- a/examples/IMPROVABLE/improvable-test.xml
+++ b/examples/IMPROVABLE/improvable-test.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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved.
@@ -11,7 +11,7 @@
Authors: Bernd Müller, Lukas Heindorf
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="IMPROVABLE-TEST-1">
diff --git a/examples/NOT PASSED/UM58-D-SI-example.xml b/examples/NOT PASSED/UM58-D-SI-example.xml
index 00c451f..cc1ea6d 100644
--- a/examples/NOT PASSED/UM58-D-SI-example.xml
+++ b/examples/NOT PASSED/UM58-D-SI-example.xml
@@ -4,7 +4,7 @@
Authors: Bojan Acko, Rok Klobucar
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
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 a86ea64..6abd4dd 100644
--- a/examples/NOT PASSED/UM59-D-SI-example.xml
+++ b/examples/NOT PASSED/UM59-D-SI-example.xml
@@ -4,7 +4,7 @@
Authors: Bojan Acko, Rok Klobucar
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
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 d5b26f1..cb37d52 100644
--- a/examples/NOT PASSED/UM60-D-SI-example.xml
+++ b/examples/NOT PASSED/UM60-D-SI-example.xml
@@ -4,7 +4,7 @@
Authors: Bojan Acko, Rok Klobucar
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
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 82e66f2..2c4c5a9 100644
--- a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml
+++ b/examples/PLATINUM/2020-03-20-UM-PLATINUM-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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved.
@@ -11,7 +11,7 @@
Authors: Bojan Acko, Rok Klobucar
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM1">
diff --git a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml
index 240e1a8..92fba53 100644
--- a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml
+++ b/examples/PLATINUM/2021-10-26-PLATINUM-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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
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 2293de6..ebbe67d 100644
--- a/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml
+++ b/examples/PLATINUM/2022-05-23-PLATINUM-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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-10-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
diff --git a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
index e5b2e99..9e2f574 100644
--- a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
+++ b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
@@ -2,17 +2,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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd
-
Copyright (c) 2018-2023 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
AUTHORS: Wafa El Jaoua, Daniel Hutzschenreuter & autors of predecessor versions
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
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 42376be..30588ca 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
diff --git a/examples/PLATINUM/PTB-PLATINUM-examples.xml b/examples/PLATINUM/PTB-PLATINUM-examples.xml
index 0e7354a..2288451 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901 10.5281/zenodo.4709001
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB1">
diff --git a/examples/PLATINUM/platinum-test.xml b/examples/PLATINUM/platinum-test.xml
index 4531757..d3b568a 100644
--- a/examples/PLATINUM/platinum-test.xml
+++ b/examples/PLATINUM/platinum-test.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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved.
@@ -11,7 +11,7 @@
Authors: Bernd Müller, Lukas Heindorf
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PLATINUM-TEST-1">
diff --git a/examples/SI-Accelaration-examples.xml b/examples/SI-Accelaration-examples.xml
index 294cdfc..0960ca0 100644
--- a/examples/SI-Accelaration-examples.xml
+++ b/examples/SI-Accelaration-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 https://www.ptb.de/si/v2.2.0/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-11-30
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 a541c01..acbb975 100644
--- a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml
+++ b/examples/SILVER/2020-03-20-UM-SILVER-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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved.
@@ -11,7 +11,7 @@
Authors: Bojan Acko, Rok Klobucar
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM3">
diff --git a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml
index 0fbe698..ddcbab4 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0-RC1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB648">
diff --git a/examples/SILVER/2022-05-23-SILVER-examples.xml b/examples/SILVER/2022-05-23-SILVER-examples.xml
index b418aa2..118b90f 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2022-2023 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
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples including quantity type for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0-RC1)</siTest:testDescription>
+ <siTest:testDescription>XML examples including quantity type for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB704">
diff --git a/examples/SILVER/PTB-SILVER-examples-2.xml b/examples/SILVER/PTB-SILVER-examples-2.xml
index bde3a8d..ff63e2b 100644
--- a/examples/SILVER/PTB-SILVER-examples-2.xml
+++ b/examples/SILVER/PTB-SILVER-examples-2.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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
@@ -11,7 +11,7 @@
CONTACT: smartcom@ptb.de
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB533">
diff --git a/examples/SILVER/PTB-SILVER-examples.xml b/examples/SILVER/PTB-SILVER-examples.xml
index dfc296b..5181b17 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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB13">
diff --git a/examples/SILVER/silver-test.xml b/examples/SILVER/silver-test.xml
index 380eea3..8f794d5 100644
--- a/examples/SILVER/silver-test.xml
+++ b/examples/SILVER/silver-test.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 ../SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved.
@@ -11,7 +11,7 @@
Authors: Bernd Müller, Lukas Heindorf
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.2.0
- RELEASE DATA: 2023-MM-DD
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.1.0)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.2.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="SILVER-TEST-1">
diff --git a/examples/SI_Format_TestData.xsd b/examples/SI_Format_TestData.xsd
index 9fe27bf..bfbdeca 100644
--- a/examples/SI_Format_TestData.xsd
+++ b/examples/SI_Format_TestData.xsd
@@ -5,15 +5,13 @@
xmlns:si="https://ptb.de/si"
elementFormDefault="qualified" >
- <xs:import namespace="https://ptb.de/si" schemaLocation="../SI_Format.xsd"/>
+ <xs:import namespace="https://ptb.de/si" schemaLocation="https://www.ptb.de/si/v2.2.0/SI_Format.xsd"/>
<xs:annotation>
<xs:documentation xml:lang="en">
-
- https://www.ptb.de/si/v2.1.0/SI_Format.xsd
-
+
D-SI test data XSD
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
This XML Scheme Definition (XSD) is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -26,8 +24,8 @@
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-11-30
DOI: 10.5281/zenodo.3366901
You should have received a copy of the GNU Lesser General Public License
diff --git a/examples/SmartCom_A1.2.3_examples.xml b/examples/SmartCom_A1.2.3_examples.xml
index 22e683b..cc13ee6 100644
--- a/examples/SmartCom_A1.2.3_examples.xml
+++ b/examples/SmartCom_A1.2.3_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 https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd">
<!--
- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+ Copyright (c) 2019 - 2023 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: 22.0
+ RELEASE DATA: 2023-11-30
DOI: 10.5281/zenodo.3366901
This XML file is free data: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
-->
<siTest:metaData>
- <siTest:testDescription>Update XML examples for SmartCom D-SI XML format version 2.1.0.</siTest:testDescription>
+ <siTest:testDescription>Update XML examples for SmartCom D-SI XML format version 2.2.0.</siTest:testDescription>
</siTest:metaData>
diff --git a/qudt/quantityKind.xsd b/qudt/quantityKind.xsd
deleted file mode 100644
index 37b8416..0000000
--- a/qudt/quantityKind.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema version="1.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://qudt.org/vocab/"
- xmlns:qudt="http://qudt.org/vocab/"
- elementFormDefault="qualified">
-
- <xs:simpleType name="quantityKind">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
-</xs:schema>
diff --git a/qudt/quantitykind.xsd b/qudt/quantitykind.xsd
new file mode 100644
index 0000000..0eefc5f
--- /dev/null
+++ b/qudt/quantitykind.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema version="1.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://qudt.org/vocab/"
+ xmlns:qudt="http://qudt.org/vocab/"
+ elementFormDefault="qualified">
+
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ D-SI - Digital System of Units
+ Copyright (c) 2018 - 2023 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
+
+ This XML Scheme Definition (XSD) is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+
+ This XSD is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this XSD. If not, see http://www.gnu.org/licenses.
+
+ CONTACT: daniel.hutzschenreuter@ptb.de
+ DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
+ D-SI XSD VERSION: 2.2.0
+ RELEASE DATA: 2023-11-30
+ DOI: 10.5281/zenodo.3366901
+ </xs:documentation>
+ <xs:documentation xml:lang="en">
+ ACKNOWLEDGEMENT:
+ This schema was developped to link QUDT type entities to the D-SI XML implementation.
+ Please, visit qudt.org for information about the QUDT web ontology.
+ To access the QUDT entries for quantity kinds from the XML, you can use the following PIDs:
+ a) https://qudt.org/vocab/quantitykind/Length --> web page
+ b) https://qudt.org/vocab/quantitykind/Length.ttl --> machine-readable TURTLE data
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:simpleType name="quantitykind">
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+
+</xs:schema>
--
GitLab