From b766e949e961d985323bed22e20571bac46fc636 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Mon, 18 Sep 2017 15:52:14 +0200
Subject: [PATCH] - workaround, because Rosetta uses the result of
getExtractionErrors() as indicator if validation fails or not, we cannot
use this way to provide partial error information - changed plugin-defaults
---
...UBTechnicalMetadataExtractorCheckItTiffPlugin.xml | 12 ++++++------
...BTechnicalMetadataExtractorCheckItTiffPlugin.java | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml b/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml
index 566463e..ede6e86 100644
--- a/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml
+++ b/PLUGIN-INF/metadata_SLUBTechnicalMetadataExtractorCheckItTiffPlugin.xml
@@ -17,7 +17,7 @@
<mandatory>true</mandatory>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
- <default_value>/usr/bin/checkit_tiff</default_value>
+ <default_value>/operational_shared/software/checkit_tiff_stable</default_value>
<css_class>width40</css_class>
<x_options></x_options>
</x_field>
@@ -26,7 +26,7 @@
<label>Path to current config file used for checkit_tiff</label>
<ui_tool_tip>add full path to configfile for checkit_tiff</ui_tool_tip>
<mandatory>true</mandatory>
- <default_value>/etc/checkit_tiff/slub.cfg</default_value>
+ <default_value>/operational_shared/software/cit_tiff6_baseline_SLUB_stable.cfg</default_value>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
<css_class>width40</css_class>
@@ -39,7 +39,7 @@
<mandatory>true</mandatory>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
- <default_value>/usr/bin/checkit_tiff</default_value>
+ <default_value>/operational_shared/software/checkit_tiff_unstable</default_value>
<css_class>width40</css_class>
<x_options></x_options>
</x_field>
@@ -48,7 +48,7 @@
<label>Path to config file used for checkit_tiff</label>
<ui_tool_tip>add full path to configfile for checkit_tiff</ui_tool_tip>
<mandatory>true</mandatory>
- <default_value>/etc/checkit_tiff/slub.cfg</default_value>
+ <default_value>/operational_shared/software/cit_tiff6_baseline_SLUB_unstable.cfg</default_value>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
<css_class>width40</css_class>
@@ -61,7 +61,7 @@
<mandatory>true</mandatory>
<x_logic_type>String</x_logic_type>
<x_ui_type>TextField</x_ui_type>
- <default_value>/usr/bin/exiftool</default_value>
+ <default_value>/usr/local/bin/exiftool</default_value>
<css_class>width40</css_class>
<x_options></x_options>
</x_field>
@@ -69,7 +69,7 @@
</fr:x_form>
</pl:initParameters>
<pl:description>SLUB Technical Metadata Extractor Plugin, using check_it_tiff to validate tiff-files</pl:description>
- <pl:version>1.94</pl:version>
+ <pl:version>1.95</pl:version>
<pl:materialType>DIGITAL</pl:materialType>
<pl:module>Preservation</pl:module>
<pl:generalType>TASK</pl:generalType>
diff --git a/java/org/slub/rosetta/dps/repository/plugin/SLUBTechnicalMetadataExtractorCheckItTiffPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/SLUBTechnicalMetadataExtractorCheckItTiffPlugin.java
index b9732ea..16ddd1a 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/SLUBTechnicalMetadataExtractorCheckItTiffPlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/SLUBTechnicalMetadataExtractorCheckItTiffPlugin.java
@@ -179,7 +179,7 @@ public class SLUBTechnicalMetadataExtractorCheckItTiffPlugin implements MDExtrac
} else if (true == is_current_checkit_tiff_valid) {
isvalid = true;
iswellformed=true;
- extractionErrors = validationLog;
+ extractionErrors.clear();
} else {
isvalid = false;
iswellformed = false;
--
GitLab