louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent double validation against ZF (which contains CEN) and CEN itself

Browse Source
This commit is contained in:
jstaerk
2025-05-15 07:46:19 +02:00
parent dd0496a031
commit 6429c5e410
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
validator/src/main/java/org/mustangproject/validator/XMLValidator.java
View File

@@ -374,12 +374,14 @@ public class XMLValidator extends Validator {
} }
if (context.getFormat().equals("CII")) { if (context.getFormat().equals("CII") && (context.getGeneration().equals("2"))) {
if (context.getGeneration().equals("2") if (isXRechnung) {
&& (isBasic || isEN16931 || isXRechnung)) { //additionally validate against CEN, the CEN rules are part of the ZF Schematron anyway
//additionally validate against CEN
validateSchematron(zfXML, "/xslt/en16931schematron/EN16931-CII-validation.xslt", 24, ESeverity.error); validateSchematron(zfXML, "/xslt/en16931schematron/EN16931-CII-validation.xslt", 24, ESeverity.error);
}
if (isXRechnung || isBasic || isEN16931) {
//potentially (basic or EN) or definitely validate against XR
if (!disableNotices || XrechnungSeverity != ESeverity.notice) { if (!disableNotices || XrechnungSeverity != ESeverity.notice) {
validateXR(zfXML, XrechnungSeverity); validateXR(zfXML, XrechnungSeverity);
} }