From d3f22edc1181b66cd2e3f38591d4c532f7f33a5a Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Tue, 4 Jun 2024 14:11:52 +0100
Subject: [PATCH] Fix multi predicate negation in check_mdrpi

From commit hash ukf/ukf-testbed/de97bc9f118de854cd627c48bca509d5b28c64d7

see ukf/ukf-meta#432 for details
---
 mdx/_rules/check_mdrpi.xsl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mdx/_rules/check_mdrpi.xsl b/mdx/_rules/check_mdrpi.xsl
index 6e96c6a..00e38ae 100644
--- a/mdx/_rules/check_mdrpi.xsl
+++ b/mdx/_rules/check_mdrpi.xsl
@@ -39,7 +39,7 @@
         </xsl:call-template>
     </xsl:template>
     <xsl:template match="md:Extensions[mdrpi:RegistrationInfo]
-        [not(parent::md:EntityDescriptor)][not(parent::md:EntitiesDescriptor)]">
+        [not((parent::md:EntityDescriptor) or (parent::md:EntitiesDescriptor))]">
         <xsl:call-template name="error">
             <xsl:with-param name="m">RegistrationInfo must only appear within Extensions of EntityDescriptor or EntitiesDescriptor</xsl:with-param>
         </xsl:call-template>
@@ -74,7 +74,7 @@
 
         registrationInstant values MUST be expressed in the UTC timezone using the 'Z' timezone identifier.
     -->
-    <xsl:template match="mdrpi:RegistrationInfo[@registrationInstant]
+    <xsl:template match="mdrpi:RegistrationInfo[@registrationInstant] 
         [substring(@registrationInstant, string-length(@registrationInstant)) != 'Z']">
         <xsl:call-template name="error">
             <xsl:with-param name="m">
@@ -126,7 +126,7 @@
         </xsl:call-template>
     </xsl:template>
     <xsl:template match="md:Extensions[mdrpi:PublicationInfo]
-        [not(parent::md:EntityDescriptor)][not(parent::md:EntitiesDescriptor)]">
+        [not((parent::md:EntityDescriptor) or (parent::md:EntitiesDescriptor))]">
         <xsl:call-template name="error">
             <xsl:with-param name="m">PublicationInfo must only appear within Extensions of EntityDescriptor or EntitiesDescriptor</xsl:with-param>
         </xsl:call-template>
@@ -162,8 +162,7 @@
         Restrict the elements in this namespace which can appear directly within md:Extensions
         to the two defined container elements.  This will catch mis-spelled containers.
     -->
-    <xsl:template match="md:Extensions/mdrpi:*
-        [not(local-name()='RegistrationInfo')][not(local-name()='PublicationInfo')]">
+    <xsl:template match="md:Extensions/mdrpi:*[not(local-name()='RegistrationInfo') and not(local-name()='PublicationInfo')]">
         <xsl:call-template name="error">
             <xsl:with-param name="m">
                 <xsl:text>misspelled or misplaced mdrpi element within md:Extensions: </xsl:text>