diff --git a/History.md b/History.md index 49b10f0a..ba05351a 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,5 @@ +- log whether a XML or a PDF file was validated + 2.4.0 ======= 2022-01-13 diff --git a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java index 1e413e63..f72aff90 100644 --- a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java @@ -90,6 +90,7 @@ public class ZUGFeRDValidator { finalStringResult .append(""); + boolean isPDF=false; try { if (filename == null) { @@ -114,7 +115,7 @@ public class ZUGFeRDValidator { xv.disableNotices(); } byte[] pdfSignature = { '%', 'P', 'D', 'F' }; - boolean isPDF = searcher.indexOf(file, pdfSignature) == 0; + isPDF = searcher.indexOf(file, pdfSignature) == 0; if (isPDF) { pdfv.setFilename(filename); @@ -250,8 +251,15 @@ public class ZUGFeRDValidator { } + String pdfResult="invalid"; + if (!isPDF) { + pdfResult="absent"; + } else if (pdfValidity) { + pdfResult="valid"; + } - LOGGER.info("Parsed PDF:" + (pdfValidity ? "valid" : "invalid") + " XML:" + (xmlValidity ? "valid" : "invalid") + + LOGGER.info("Parsed PDF:" + pdfResult + " XML:" + (xmlValidity ? "valid" : "invalid") + " Signature:" + Signature + " Checksum:" + sha1Checksum + " Profile:" + context.getProfile() + " Version:" + context.getGeneration() + " Took:" + duration + "ms Errors:["+context.getCSVResult()+"] "+toBeAppended); wasCompletelyValid = ((pdfValidity) && (xmlValidity));