From 4790078ac690a2fc01d13c642cec0ac3989f0963 Mon Sep 17 00:00:00 2001 From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de> Date: Mon, 30 Nov 2020 14:30:51 +0100 Subject: [PATCH] even more CDATA (for all "dcc:content") --- templates/xml/calibration_item.xml | 6 ++++++ templates/xml/calibration_laboratory.xml | 10 +++++++--- templates/xml/customer.xml | 2 ++ templates/xml/influence_conditions.xml | 4 ++++ templates/xml/responsible_persons.xml | 2 ++ templates/xml/results.xml | 4 ++++ templates/xml/used_methods.xml | 2 ++ templates/xml/used_software.xml | 2 ++ 8 files changed, 29 insertions(+), 3 deletions(-) diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml index 63c627b..30b54de 100644 --- a/templates/xml/calibration_item.xml +++ b/templates/xml/calibration_item.xml @@ -3,9 +3,11 @@ <dcc:name> {%- for i in x['name'] %} <dcc:content lang="{{i.lang}}"> + <![CDATA[ {%- for j in i.content %} {{j|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> @@ -14,9 +16,11 @@ <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:name> @@ -35,9 +39,11 @@ <dcc:name> {%- for j in i.manufacturer['name'] %} <dcc:content lang="{{j.lang}}"> + <![CDATA[ {%- for k in j.content %} {{k|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> diff --git a/templates/xml/calibration_laboratory.xml b/templates/xml/calibration_laboratory.xml index 2285ff9..3cdc5f7 100644 --- a/templates/xml/calibration_laboratory.xml +++ b/templates/xml/calibration_laboratory.xml @@ -4,9 +4,11 @@ <dcc:name> {%- for i in x['name'] %} <dcc:content lang="{{i.lang}}"> + <![CDATA[ {%- for j in i.content %} {{j|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> @@ -15,9 +17,11 @@ <dcc:further> {%- for i in x.location.further %} <dcc:content lang="{{i.lang}}"> - {%- for j in i.content %} - {{j|safe}} - {% endfor -%} + <![CDATA[ + {%- for j in i.content %} + {{j|safe}} + {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:further> diff --git a/templates/xml/customer.xml b/templates/xml/customer.xml index 34ae060..7638329 100644 --- a/templates/xml/customer.xml +++ b/templates/xml/customer.xml @@ -3,9 +3,11 @@ <dcc:name> {%- for i in x['name'] %} <dcc:content lang="{{i.lang}}"> + <![CDATA[ {%- for j in i.content %} {{j|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> diff --git a/templates/xml/influence_conditions.xml b/templates/xml/influence_conditions.xml index 6120058..bbd30d2 100644 --- a/templates/xml/influence_conditions.xml +++ b/templates/xml/influence_conditions.xml @@ -8,9 +8,11 @@ <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:name> @@ -22,9 +24,11 @@ <dcc:name> {%- for l in v['name'] %} <dcc:content lang="{{l.lang}}"> + <![CDATA[ {%- for m in l.content %} {{m|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> diff --git a/templates/xml/responsible_persons.xml b/templates/xml/responsible_persons.xml index 17d6318..e94960d 100644 --- a/templates/xml/responsible_persons.xml +++ b/templates/xml/responsible_persons.xml @@ -5,9 +5,11 @@ <dcc:name> {%- for j in i.person['name'] %} <dcc:content lang="{{j.lang}}"> + <![CDATA[ {%- for k in j.content %} {{k|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> diff --git a/templates/xml/results.xml b/templates/xml/results.xml index 49b0410..1d9ce9e 100644 --- a/templates/xml/results.xml +++ b/templates/xml/results.xml @@ -4,9 +4,11 @@ <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:name> @@ -16,9 +18,11 @@ <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:name> diff --git a/templates/xml/used_methods.xml b/templates/xml/used_methods.xml index ceb2fe9..c7ba827 100644 --- a/templates/xml/used_methods.xml +++ b/templates/xml/used_methods.xml @@ -4,9 +4,11 @@ <dcc:name {%- if i.id %} id="{{i.id}}" {% endif -%}> {%- for j in i['name'] %} <dcc:content lang="{{j.lang}}"> + <![CDATA[ {%- for k in j.content %} {{k|safe}} {% endfor -%} + ]]> </dcc:content> {% endfor -%} </dcc:name> diff --git a/templates/xml/used_software.xml b/templates/xml/used_software.xml index 3cde4ea..23bade3 100644 --- a/templates/xml/used_software.xml +++ b/templates/xml/used_software.xml @@ -4,9 +4,11 @@ <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:name> -- GitLab