From 922169997ab095f16f0e5b0e13c2e3bcbec81d75 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <art1@andreas-romeyke.de>
Date: Mon, 12 Apr 2021 10:37:12 +0200
Subject: [PATCH] - bugfix, if audio exist, *all* subrules should be
 *and*-combined

---
 SLUB_mediaconch_policy_retrodigitized_film16mm.xml | 2 +-
 SLUB_mediaconch_policy_retrodigitized_film35mm.xml | 2 +-
 SLUB_mediaconch_policy_retrodigitized_film8mm.xml  | 2 +-
 SLUB_mediaconch_policy_retrodigitized_video.xml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SLUB_mediaconch_policy_retrodigitized_film16mm.xml b/SLUB_mediaconch_policy_retrodigitized_film16mm.xml
index dae8da8..44ef546 100644
--- a/SLUB_mediaconch_policy_retrodigitized_film16mm.xml
+++ b/SLUB_mediaconch_policy_retrodigitized_film16mm.xml
@@ -74,7 +74,7 @@
     
     <policy type="or" name="Audio">
       <rule name="Audio does not exist" value="AudioCount" tracktype="General" occurrence="*" operator="must not exist"/>
-      <policy type="or" name="Audio exist">
+      <policy type="and" name="Audio exist">
         <rule name="General/AudioCount is 1" value="AudioCount" tracktype="General" occurrence="*" operator="&gt;=">1</rule>
         <policy type="or" name="Audio is PCM or FLAC">
           <rule name="Audio is PCM" value="Format" tracktype="Audio" occurrence="*" operator="=">PCM</rule>
diff --git a/SLUB_mediaconch_policy_retrodigitized_film35mm.xml b/SLUB_mediaconch_policy_retrodigitized_film35mm.xml
index caa88ea..cba8ba6 100644
--- a/SLUB_mediaconch_policy_retrodigitized_film35mm.xml
+++ b/SLUB_mediaconch_policy_retrodigitized_film35mm.xml
@@ -77,7 +77,7 @@
     
     <policy type="or" name="Audio">
       <rule name="Audio does not exist" value="AudioCount" tracktype="General" occurrence="*" operator="must not exist"/>
-      <policy type="or" name="Audio exist">
+      <policy type="and" name="Audio exist">
         <rule name="General/AudioCount is 1" value="AudioCount" tracktype="General" occurrence="*" operator="&gt;=">1</rule>
         <policy type="or" name="Audio is PCM or FLAC">
           <rule name="Audio is PCM" value="Format" tracktype="Audio" occurrence="*" operator="=">PCM</rule>
diff --git a/SLUB_mediaconch_policy_retrodigitized_film8mm.xml b/SLUB_mediaconch_policy_retrodigitized_film8mm.xml
index 3ee26bc..72fb88b 100644
--- a/SLUB_mediaconch_policy_retrodigitized_film8mm.xml
+++ b/SLUB_mediaconch_policy_retrodigitized_film8mm.xml
@@ -62,7 +62,7 @@
 
     <policy type="or" name="Audio">
       <rule name="Audio does not exist" value="AudioCount" tracktype="General" occurrence="*" operator="must not exist"/>
-      <policy type="or" name="Audio exist">
+      <policy type="and" name="Audio exist">
         <rule name="General/AudioCount is 1" value="AudioCount" tracktype="General" occurrence="*" operator="&gt;=">1</rule>
         <policy type="or" name="Audio is PCM or FLAC">
           <rule name="Audio is PCM" value="Format" tracktype="Audio" occurrence="*" operator="=">PCM</rule>
diff --git a/SLUB_mediaconch_policy_retrodigitized_video.xml b/SLUB_mediaconch_policy_retrodigitized_video.xml
index c3bde8f..27b02e7 100644
--- a/SLUB_mediaconch_policy_retrodigitized_video.xml
+++ b/SLUB_mediaconch_policy_retrodigitized_video.xml
@@ -88,7 +88,7 @@
       <rule name="Bit Depth is 10" value="BitDepth" tracktype="Video" occurrence="*" operator="=">10</rule>      
     </policy>
 
-    <policy type="or" name="Audio">
+    <policy type="and" name="Audio">
       <rule name="General/AudioCount is 1" value="AudioCount" tracktype="General" occurrence="*" operator="&gt;=">1</rule>
       <policy type="or" name="Audio is PCM or FLAC">
         <rule name="Audio is PCM" value="Format" tracktype="Audio" occurrence="*" operator="=">PCM</rule>
-- 
GitLab