From ceac53d292b204d9996fdbee7d16a9a643bba670 Mon Sep 17 00:00:00 2001 From: Thomas Scheffler Date: Wed, 24 Apr 2024 15:26:21 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Revert=20"MIR-1304=20Revert=20"MIR-1198=20S?= =?UTF-8?q?upport=20validation=20of=20PDF/A=20documents=20(#900=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a41e00862f2cb1ce4c6150a61cce39dba389eba1. --- .../config/mir/messages_de.properties | 8 + .../config/mir/messages_en.properties | 8 + .../xsl/metadata/mir-pdf-errorbox.xsl | 182 ++++++++++++++++++ .../resources/xsl/metadata/mir-workflow.xsl | 3 +- 4 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties index 66b3b81b92..da95f11c84 100644 --- a/mir-module/src/main/resources/config/mir/messages_de.properties +++ b/mir-module/src/main/resources/config/mir/messages_de.properties @@ -913,3 +913,11 @@ subselect.category.title = Kategorie ausw\u00E4hlen user.profile.id.orcid = Ihre ORCID iD selfRegistration.error.mailExists = Die E-Mail-Adresse wird bereits verwendet. +pdf.errorbox.warning.message=Achtung! Bei einigen Ihrer PDF/A Dokumente sind Fehler aufgetreten. Bitte stellen Sie sicher, dass ihre PDF/A Dokumente mit aktuellen und geeigneten Programmen erstellt wurden und lesen Sie die Fehlerdokumentation. Anbei finden Sie eine Liste der aufgetretenen Fehler! +pdf.errorbox.warning.heading=Warnung! +pdf.errorbox.success.heading=Erfolg! +pdf.errorbox.success.message=Ihre PDF Dokumente wurden \u00FCberpr\u00FCft und es wurden keine Fehler gefunden. +pdf.errorbox.button.info=Mehr Informationen +pdf.errorbox.button.download=Herunterladen +pdf.errorbox.conformity.level=Konformit\u00E4tstufe +pdf.errorbox.unknown.error=Keine weiteren Informationen! diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties index 3e78c44add..1ce301f82d 100644 --- a/mir-module/src/main/resources/config/mir/messages_en.properties +++ b/mir-module/src/main/resources/config/mir/messages_en.properties @@ -865,3 +865,11 @@ subselect.category.cancel = Cancel subselect.category.title = Choose category user.profile.id.orcid = Your ORCID iD +pdf.errorbox.warning.message=Attention! Errors have occurred with some of your PDF/A documents. Please make sure that your PDF/A documents were created with up-to-date and suitable programs and read the error documentation. You will find a list of the occurred errors below! +pdf.errorbox.warning.heading=Warning! +pdf.errorbox.success.heading=Success! +pdf.errorbox.success.message=Your PDF documents were verified and no errors were found. +pdf.errorbox.button.info=Learn More +pdf.errorbox.button.download=Download +pdf.errorbox.conformity.level=Conformity level +pdf.errorbox.unknown.error=No further information! diff --git a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl new file mode 100644 index 0000000000..9be4862b8f --- /dev/null +++ b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+

+ +

+

+ +

+
+
+
+ +
+
+
+ +
+
+

+ +

+

+ +

+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + danger + success + + + + +
    +
  • +

    + + + + + + +

    + + + + + + + + + +
  • + +
+
+ + + +
  • +

    + + Specification: + + + + + + Clause: + + + + + + Test: + + + + +

    + + + + + + + + + + + +
  • +
    + + + + + + + + + + + + + + + + + + + + + + +
    diff --git a/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl b/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl index 843114786e..39aead7430 100644 --- a/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl +++ b/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl @@ -7,7 +7,7 @@ - + @@ -127,6 +127,7 @@ Dokument submitted + From 68112b0bc379831a65e75e8b74707fb70c856f57 Mon Sep 17 00:00:00 2001 From: Thomas Scheffler Date: Wed, 24 Apr 2024 15:32:18 +0200 Subject: [PATCH 2/4] MIR-1198 use mode parameter to seperate templates from other includes --- .../xsl/metadata/mir-pdf-errorbox.xsl | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl index 9be4862b8f..32b9e398e7 100644 --- a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl +++ b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl @@ -6,21 +6,16 @@ xmlns:xalan="http://xml.apache.org/xalan" version="1.0" exclude-result-prefixes="i18n mcrxsl"> - - + - + - - -
    @@ -54,24 +49,20 @@ - - + - + - - + - - - + @@ -115,12 +106,11 @@ - + - - +
  • @@ -158,13 +148,12 @@

  • - - + - + From 7112add401b3b00be05029ad9d64fd2421ef1d9c Mon Sep 17 00:00:00 2001 From: Antoniafriedrich Date: Fri, 4 Oct 2024 10:52:31 +0200 Subject: [PATCH 3/4] MIR-1329 Add Property to enable PDF/A Validation in Workflow Adds a mycore property to enable PDF/A validation seperately to Mir Workflow. Default is false. --- mir-module/src/main/resources/config/mir/mycore.properties | 2 +- mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties index 0794d51110..3ad534a7af 100644 --- a/mir-module/src/main/resources/config/mir/mycore.properties +++ b/mir-module/src/main/resources/config/mir/mycore.properties @@ -733,7 +733,7 @@ MCR.Object.Static.Content.Generator.mir-history.Transformer=mir-history MCR.URIResolver.xslImports.mirworkflow=metadata/mir-workflow.xsl MIR.Workflow.Menu=false MIR.Workflow.Box=false - +MIR.EnablePdfaValidationInWorkflow=false ############################################################################## # new Metadata Layout # ############################################################################## diff --git a/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl b/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl index 39aead7430..442a7fd431 100644 --- a/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl +++ b/mir-module/src/main/resources/xsl/metadata/mir-workflow.xsl @@ -15,6 +15,7 @@ + @@ -127,7 +128,10 @@ Dokument submitted - + + + + From 2b88614d8acb937e7d72f6c1cd3157acc56bf8bc Mon Sep 17 00:00:00 2001 From: Antoniafriedrich Date: Mon, 21 Oct 2024 14:15:24 +0200 Subject: [PATCH 4/4] Some changes Adds translation, removes unused variables and fixes some minor issues --- .../config/mir/messages_de.properties | 3 ++ .../config/mir/messages_en.properties | 3 ++ .../resources/config/mir/mycore.properties | 2 +- .../xsl/metadata/mir-pdf-errorbox.xsl | 34 +++++++++---------- .../resources/xsl/metadata/mir-workflow.xsl | 4 +-- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties index da95f11c84..9d2b4797a4 100644 --- a/mir-module/src/main/resources/config/mir/messages_de.properties +++ b/mir-module/src/main/resources/config/mir/messages_de.properties @@ -921,3 +921,6 @@ pdf.errorbox.button.info=Mehr Informationen pdf.errorbox.button.download=Herunterladen pdf.errorbox.conformity.level=Konformit\u00E4tstufe pdf.errorbox.unknown.error=Keine weiteren Informationen! +pdf.errorbox.clause="Paragraph" +pdf.errorbox.test="Test" +pdf.errorbox.specification="Spezifikation" diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties index 1ce301f82d..bed12b0ab5 100644 --- a/mir-module/src/main/resources/config/mir/messages_en.properties +++ b/mir-module/src/main/resources/config/mir/messages_en.properties @@ -873,3 +873,6 @@ pdf.errorbox.button.info=Learn More pdf.errorbox.button.download=Download pdf.errorbox.conformity.level=Conformity level pdf.errorbox.unknown.error=No further information! +pdf.errorbox.clause="Clause" +pdf.errorbox.test="Test" +pdf.errorbox.specification="Specification" diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties index 3ad534a7af..7d35f655d5 100644 --- a/mir-module/src/main/resources/config/mir/mycore.properties +++ b/mir-module/src/main/resources/config/mir/mycore.properties @@ -733,7 +733,7 @@ MCR.Object.Static.Content.Generator.mir-history.Transformer=mir-history MCR.URIResolver.xslImports.mirworkflow=metadata/mir-workflow.xsl MIR.Workflow.Menu=false MIR.Workflow.Box=false -MIR.EnablePdfaValidationInWorkflow=false +MIR.Workflow.PDFValidation=false ############################################################################## # new Metadata Layout # ############################################################################## diff --git a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl index 32b9e398e7..7bc72285c3 100644 --- a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl +++ b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl @@ -6,18 +6,16 @@ xmlns:xalan="http://xml.apache.org/xalan" version="1.0" exclude-result-prefixes="i18n mcrxsl"> - - - + - + - +