From 3faedcea65cedb24c667a777fa6e3a7edfe835b8 Mon Sep 17 00:00:00 2001
From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com>
Date: Tue, 3 Dec 2024 11:23:59 +0000
Subject: [PATCH] RP - tweak aff-no-wrap check

---
 src/rp-schematron-base.sch                                   | 2 +-
 src/rp-schematron.sch                                        | 2 +-
 src/rp-schematron.xsl                                        | 4 ++--
 test/tests/rp/affiliation-checks/aff-no-wrap/aff-no-wrap.sch | 2 +-
 test/tests/rp/affiliation-checks/aff-no-wrap/fail.xml        | 2 +-
 test/tests/rp/affiliation-checks/aff-no-wrap/pass.xml        | 2 +-
 test/xspec/rp-schematron.sch                                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/rp-schematron-base.sch b/src/rp-schematron-base.sch
index 82db63e558..b4fed8cc2e 100644
--- a/src/rp-schematron-base.sch
+++ b/src/rp-schematron-base.sch
@@ -393,7 +393,7 @@
         role="error" 
         id="aff-multiple-ids">Affiliation contains more than one institution-id element: <value-of select="string-join(descendant::institution-id,'; ')"/> in <value-of select="."/></report>
       
-      <report test="ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" 
+      <report test="ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" 
         role="warning" 
         id="aff-no-wrap">Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
       
diff --git a/src/rp-schematron.sch b/src/rp-schematron.sch
index 0e4892d068..ceaf04ef1f 100644
--- a/src/rp-schematron.sch
+++ b/src/rp-schematron.sch
@@ -265,7 +265,7 @@
       
       <report test="count(descendant::institution-id) gt 1" role="error" id="aff-multiple-ids">[aff-multiple-ids] Affiliation contains more than one institution-id element: <value-of select="string-join(descendant::institution-id,'; ')"/> in <value-of select="."/></report>
       
-      <report test="ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" role="warning" id="aff-no-wrap">[aff-no-wrap] Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
+      <report test="ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" role="warning" id="aff-no-wrap">[aff-no-wrap] Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
       
       <report test="institution-wrap[not(institution-id)] and not(ancestor::contrib-group[@content-type='section']) and not(ancestor::sub-article)" role="error" id="aff-has-wrap-no-id">[aff-has-wrap-no-id] aff contains institution-wrap, but that institution-wrap does not have a child institution-id. institution-wrap should only be used when there is an institution-id for the institution.</report>
       
diff --git a/src/rp-schematron.xsl b/src/rp-schematron.xsl
index 87390e1ad8..9bc8818c2c 100644
--- a/src/rp-schematron.xsl
+++ b/src/rp-schematron.xsl
@@ -2046,8 +2046,8 @@
          </svrl:successful-report>
       </xsl:if>
       <!--REPORT warning-->
-      <xsl:if test="ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0">
-         <svrl:successful-report xmlns:svrl="http://purl.oclc.org/dsdl/svrl" test="ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0">
+      <xsl:if test="ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0">
+         <svrl:successful-report xmlns:svrl="http://purl.oclc.org/dsdl/svrl" test="ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0">
             <xsl:attribute name="id">aff-no-wrap</xsl:attribute>
             <xsl:attribute name="role">warning</xsl:attribute>
             <xsl:attribute name="location">
diff --git a/test/tests/rp/affiliation-checks/aff-no-wrap/aff-no-wrap.sch b/test/tests/rp/affiliation-checks/aff-no-wrap/aff-no-wrap.sch
index 016afd91c9..587a01b335 100644
--- a/test/tests/rp/affiliation-checks/aff-no-wrap/aff-no-wrap.sch
+++ b/test/tests/rp/affiliation-checks/aff-no-wrap/aff-no-wrap.sch
@@ -147,7 +147,7 @@
   <pattern id="affiliation-checks-pattern">
     <rule context="aff" id="affiliation-checks">
       <let name="country-count" value="count(descendant::country)"/>
-      <report test="ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" role="warning" id="aff-no-wrap">[aff-no-wrap] Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
+      <report test="ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" role="warning" id="aff-no-wrap">[aff-no-wrap] Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
     </rule>
   </pattern>
   <pattern id="root-pattern">
diff --git a/test/tests/rp/affiliation-checks/aff-no-wrap/fail.xml b/test/tests/rp/affiliation-checks/aff-no-wrap/fail.xml
index 164e39b506..f5c5e61c0e 100644
--- a/test/tests/rp/affiliation-checks/aff-no-wrap/fail.xml
+++ b/test/tests/rp/affiliation-checks/aff-no-wrap/fail.xml
@@ -1,6 +1,6 @@
 <?oxygen SCHSchema="aff-no-wrap.sch"?>
 <!--Context: aff
-Test: report    ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0
+Test: report    ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0
 Message: Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct? -->
 <root xmlns:ali="http://www.niso.org/schemas/ali/1.0/" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink">
     <article>
diff --git a/test/tests/rp/affiliation-checks/aff-no-wrap/pass.xml b/test/tests/rp/affiliation-checks/aff-no-wrap/pass.xml
index da2ae18a18..af592005ca 100644
--- a/test/tests/rp/affiliation-checks/aff-no-wrap/pass.xml
+++ b/test/tests/rp/affiliation-checks/aff-no-wrap/pass.xml
@@ -1,6 +1,6 @@
 <?oxygen SCHSchema="aff-no-wrap.sch"?>
 <!--Context: aff
-Test: report    ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0
+Test: report    ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0
 Message: Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct? -->
 <root xmlns:ali="http://www.niso.org/schemas/ali/1.0/" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink">
     <article>
diff --git a/test/xspec/rp-schematron.sch b/test/xspec/rp-schematron.sch
index e2cd75b846..0019b6a4c3 100644
--- a/test/xspec/rp-schematron.sch
+++ b/test/xspec/rp-schematron.sch
@@ -300,7 +300,7 @@
       <report test="count(descendant::institution-id) gt 1" role="error" id="aff-multiple-ids">Affiliation contains more than one institution-id element: <value-of select="string-join(descendant::institution-id,'; ')"/> in <value-of select="."/>
       </report>
       
-      <report test="ancestor::article/journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" role="warning" id="aff-no-wrap">Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
+      <report test="ancestor::article//journal-meta/lower-case(journal-id[1])='elife' and count(institution-wrap) = 0" role="warning" id="aff-no-wrap">Affiliation doesn't have an institution-wrap element (the container for institution name and id). Is that correct?</report>
       
       <report test="institution-wrap[not(institution-id)] and not(ancestor::contrib-group[@content-type='section']) and not(ancestor::sub-article)" role="error" id="aff-has-wrap-no-id">aff contains institution-wrap, but that institution-wrap does not have a child institution-id. institution-wrap should only be used when there is an institution-id for the institution.</report>