From 9f632e0efe82c08d77595178a821e326f5aa8668 Mon Sep 17 00:00:00 2001 From: arjan Date: Thu, 21 Nov 2024 12:48:55 +0100 Subject: [PATCH] IHW: Correcties op validatie van MIM model Zie #255 Hier is beschreven dat het type van een "GEGEVENSGROEP" attribuut beperkt is, en in ider geval geen "REFERENTIELIJST" kan zijn. Ook is een interface acceptabel als type. Minor, uitbreiding van validatie en MIM format XML schema --- .../xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd | 3 ++- src/main/resources/input/IHW/props/IHW.xlsx | Bin 22995 -> 23015 bytes .../xsl/Validator/Imvert2validation.xsl | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd index 271a581c..606c7580 100644 --- a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd +++ b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd @@ -327,7 +327,8 @@ - + + diff --git a/src/main/resources/input/IHW/props/IHW.xlsx b/src/main/resources/input/IHW/props/IHW.xlsx index 2dbddf9306bb9b7a8ade2128c4f9d22f32224bc3..3d6137dd3270b92ec9f667ab2ebd8bb400d916a9 100644 GIT binary patch delta 14207 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 V$3!ble&D3U3QbaoUuyqY{|kh}bBzE1 delta 14190 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

U+twR+tf9 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 J${PQ&{tIy|L9YM+ diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl index 9ae7df22..af56ed18 100644 --- a/src/main/resources/xsl/Validator/Imvert2validation.xsl +++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl @@ -879,7 +879,7 @@ - + @@ -894,6 +894,13 @@ imvert:stereotype/@id = 'stereotype-name-attributegroup' and not($defining-class/imvert:designation = 'class'), '[1] type must be an UML class', imf:string-group(imf:get-config-stereotypes('stereotype-name-attributegroup'),' or '))"/> + + @@ -904,7 +911,7 @@ - +