From 782c53d57e6d37586bf3b426238d2e63c4a79ed4 Mon Sep 17 00:00:00 2001
From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
Date: Fri, 5 Nov 2021 10:54:37 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20zu=20DCC=203.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/xml/calibration_item.xml | 6 +++---
templates/xml/core_data.xml | 9 ++++++---
templates/xml/dcc.xml | 5 +++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml
index 50eb6d2..fa30506 100644
--- a/templates/xml/calibration_item.xml
+++ b/templates/xml/calibration_item.xml
@@ -37,13 +37,13 @@
<dcc:identification>
<dcc:issuer>{{j.issuer}}</dcc:issuer>
<dcc:value>{{j.value}}</dcc:value>
- <dcc:description>
- {%- for k in j['description'] %}
+ <dcc:name>
+ {%- for k in j['name'] %}
<dcc:content lang="{{k.lang}}">
<![CDATA[{%- for l in k.content %}{{l|safe}}{% endfor -%}]]>
</dcc:content>
{% endfor -%}
- </dcc:description>
+ </dcc:name>
</dcc:identification>
{% endfor -%}
</dcc:identifications>
diff --git a/templates/xml/core_data.xml b/templates/xml/core_data.xml
index db36439..dbd155d 100644
--- a/templates/xml/core_data.xml
+++ b/templates/xml/core_data.xml
@@ -17,13 +17,13 @@
<dcc:identification>
<dcc:issuer>{{i.issuer}}</dcc:issuer>
<dcc:value>{{i.value}}</dcc:value>
- <dcc:description>
- {%- for j in i['description'] %}
+ <dcc:name>
+ {%- for j in i['name'] %}
<dcc:content lang="{{j.lang}}">
<![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
</dcc:content>
{% endfor -%}
- </dcc:description>
+ </dcc:name>
</dcc:identification>
{% endfor -%}
</dcc:identifications>
@@ -38,4 +38,7 @@
<dcc:endPerformanceDate>
{{x.endPerformanceDate}}
</dcc:endPerformanceDate>
+ <dcc:performanceLocation>
+ {{x.performanceLocation}}
+ </dcc:performanceLocation>
</dcc:coreData>
diff --git a/templates/xml/dcc.xml b/templates/xml/dcc.xml
index a89e54e..a533f48 100644
--- a/templates/xml/dcc.xml
+++ b/templates/xml/dcc.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<dcc:digitalCalibrationCertificate
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://ptb.de/dcc https://ptb.de/dcc/v2.4.0/dcc.xsd"
+ xsi:schemaLocation="https://ptb.de/dcc https://ptb.de/dcc/v3.0.0/dcc.xsd"
xmlns:dcc="https://ptb.de/dcc"
xmlns:si="https://ptb.de/si"
- schemaVersion="2.4.0">
+ schemaVersion="3.0.0">
<!--
Copyright (c) 2019 - Physikalisch-Technische Bundesanstalt, alle Rechte
vorbehalten - all rights reserved
@@ -46,6 +46,7 @@
</dcc:administrativeData>
<dcc:measurementResults>
<dcc:measurementResult>
+ {% include 'xml/result_header.xml' %}
{% include 'xml/used_methods.xml' %}
{% include 'xml/influence_conditions.xml' %}
{% include 'xml/results.xml' %}
--
GitLab