From c353f941270d268c7d0d6b46fa6fa0a0eb2c491e Mon Sep 17 00:00:00 2001
From: Jens Steidl <Jens.Steidl@slub-dresden.de>
Date: Fri, 6 Sep 2024 17:26:28 +0200
Subject: [PATCH] - refactor: switched to mediaconch xml output
---
src/usr/local/bin/mediaconch_validation_wrapper.sh | 2 +-
src/usr/local/bin/validate_workflow.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/usr/local/bin/mediaconch_validation_wrapper.sh b/src/usr/local/bin/mediaconch_validation_wrapper.sh
index 933331a..785d393 100755
--- a/src/usr/local/bin/mediaconch_validation_wrapper.sh
+++ b/src/usr/local/bin/mediaconch_validation_wrapper.sh
@@ -24,4 +24,4 @@ echo "${TOOL_OUTPUT}"
# exit code
# 0 -> valid media file
# 1 -> invalid media file
-echo "${TOOL_OUTPUT}" | grep -m 1 "Outcome" | grep -v "fail" > /dev/null
+echo "${TOOL_OUTPUT}" | grep -m 1 "outcome=" | grep -v "outcome=\"fail\"" > /dev/null
diff --git a/src/usr/local/bin/validate_workflow.sh b/src/usr/local/bin/validate_workflow.sh
index 0ab26b1..9c4314e 100755
--- a/src/usr/local/bin/validate_workflow.sh
+++ b/src/usr/local/bin/validate_workflow.sh
@@ -131,8 +131,8 @@ validators[__forensdta_ewf_upcoming]="/usr/bin/ewfverify -v \"FILE\""
validators[__forensdta_ewf__current]="/usr/bin/ewfverify -v \"FILE\""
validators[_retromuenz_tif_upcoming]="/usr/bin/checkit_tiff_upcoming -mq /usr/share/checkit_tiff_upcoming/example_configs/cit_tiff_retrofotos_SLUB.cfg \"FILE\""
validators[_retromuenz_tif__current]="/usr/bin/checkit_tiff_current -mq /usr/share/checkit_tiff_current/example_configs/cit_tiff_retrofotos_SLUB.cfg \"FILE\""
-validators[____retrovf_mkv__current]="/usr/local/bin/mediaconch_validation_wrapper.sh -ft -p /usr/local/etc/mediaconch/SLUB_mediaconch_policy_all.xml \"FILE\""
-validators[____retrovf_mkv_upcoming]="/usr/local/bin/mediaconch_validation_wrapper.sh -ft -p /usr/local/etc/mediaconch/SLUB_mediaconch_policy_all.xml \"FILE\""
+validators[____retrovf_mkv__current]="/usr/local/bin/mediaconch_validation_wrapper.sh -fx -p /usr/local/etc/mediaconch/SLUB_mediaconch_policy_all.xml \"FILE\""
+validators[____retrovf_mkv_upcoming]="/usr/local/bin/mediaconch_validation_wrapper.sh -fx -p /usr/local/etc/mediaconch/SLUB_mediaconch_policy_all.xml \"FILE\""
set -o nounset # Treat unset variables as an error
--
GitLab