From e4779c72b35d5250bdc0d2497a5edeea1f885e2f Mon Sep 17 00:00:00 2001
From: Winona Salesky <wsalesky@gmail.com>
Date: Tue, 16 Jan 2024 08:12:29 -0500
Subject: [PATCH] Updates to JoE record view. #133

---
 johnofephesus/persons/record.html |  2 +-
 johnofephesus/places/record.html  |  2 +-
 resources/xsl/tei2html.xsl        | 84 ++++++++++++++++++++++++++-----
 3 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/johnofephesus/persons/record.html b/johnofephesus/persons/record.html
index 4992966..edff52c 100644
--- a/johnofephesus/persons/record.html
+++ b/johnofephesus/persons/record.html
@@ -5,7 +5,7 @@
             <div data-template="app:other-data-formats" data-template-formats="print,tei,rdf,text"/>
             <div class="row">
                 <div class="col-md-7 col-lg-8">
-                    <div data-template="app:display-nodes" data-template-paths="descendant-or-self::tei:TEI"/>
+                    <div data-template="app:display-nodes" data-template-paths="descendant-or-self::tei:TEI" data-template-collection="johnofephesusPersons"/>
                 </div>
                 <div class="col-md-5 col-lg-4 right-menu">
                     <br/>
diff --git a/johnofephesus/places/record.html b/johnofephesus/places/record.html
index 59ae289..24291a1 100644
--- a/johnofephesus/places/record.html
+++ b/johnofephesus/places/record.html
@@ -4,7 +4,7 @@
             <div data-template="app:other-data-formats" data-template-formats="print,tei,rdf,text"/>
             <div class="row">
                 <div class="col-md-7 col-lg-8">
-                    <div data-template="app:display-nodes" data-template-paths="descendant-or-self::tei:TEI"/>
+                    <div data-template="app:display-nodes" data-template-paths="descendant-or-self::tei:TEI" data-template-collection="johnofephesusPlaces"/>
                 </div>
                 <div class="col-md-5 col-lg-4 right-menu">
                     <!-- Make dynamic -->
diff --git a/resources/xsl/tei2html.xsl b/resources/xsl/tei2html.xsl
index 3ba253f..37f692d 100644
--- a/resources/xsl/tei2html.xsl
+++ b/resources/xsl/tei2html.xsl
@@ -1,4 +1,4 @@
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:t="http://www.tei-c.org/ns/1.0" xmlns:x="http://www.w3.org/1999/xhtml" xmlns:srophe="https://srophe.app" xmlns:saxon="http://saxon.sf.net/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:local="http://syriaca.org/ns" exclude-result-prefixes="xs t x saxon local" version="2.0">
+<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:srophe="https://srophe.app" xmlns:saxon="http://saxon.sf.net/" xmlns:local="http://syriaca.org/ns" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:t="http://www.tei-c.org/ns/1.0" xmlns:x="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs t x saxon local" version="2.0">
 
  <!-- ================================================================== 
        Copyright 2013 New York University  
@@ -608,9 +608,25 @@
     <!-- Main page modules for syriaca.org display -->
     <xsl:template match="t:person">
         <xsl:if test="t:desc[@type='abstract'] | t:desc[starts-with(@xml:id, 'abstract-en')] | t:note[@type='abstract']">
-            <div class="tei-desc text abstract">
-                <xsl:apply-templates select="t:desc[@type='abstract' or starts-with(@xml:id, 'abstract-en')][1] | t:note[@type='abstract']"/>
-            </div>
+            <xsl:choose>
+                <xsl:when test="$collection = 'johnofephesusPersons'">
+                    <xsl:if test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/johnofephesus/persons')]">
+                        <div class="tei-desc text abstract">
+                            <xsl:apply-templates select="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/johnofephesus/persons')]"/>
+                        </div>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:when test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/persons')]">
+                    <div class="tei-desc text abstract">
+                        <xsl:apply-templates select="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/persons')]"/>    
+                    </div>
+                </xsl:when>
+                <xsl:otherwise>
+                    <div class="tei-desc text abstract">
+                        <xsl:apply-templates select="t:desc[@type='abstract' or starts-with(@xml:id, 'abstract-en')][1] | t:note[@type='abstract'][1]"/>
+                    </div>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:if>
         <xsl:if test="t:persName[not(empty(descendant-or-self::text()))]">
             <h3>Names</h3>
@@ -695,8 +711,22 @@
         </xsl:if>
         
         <xsl:if test="not(empty(t:note[not(@type='description')][1]))">
-            <h3>Notes</h3>
-            <xsl:apply-templates select="t:note[not(@type='description')]"/>
+            <xsl:choose>
+                <xsl:when test="$collection = 'johnofephesusPersons'">
+                    <xsl:if test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/johnofephesus/persons')]">
+                        <h3>Notes</h3>
+                        <xsl:apply-templates select="t:note[not(@type='description')][not(contains(@corresp,'http://syriaca.org/johnofephesus/persons'))]"/>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:when test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/persons')]">
+                    <h3>Notes</h3>
+                    <xsl:apply-templates select="t:note[not(@type='description')][not(contains(@corresp,'http://syriaca.org/persons'))]"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <h3>Notes</h3>
+                    <xsl:apply-templates select="t:note[not(@type='description')]"/>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:if>
         
         <div class="info-btns">  
@@ -720,9 +750,25 @@
     </xsl:template>
     <xsl:template match="t:place">
         <xsl:if test="t:desc[@type='abstract'] | t:desc[starts-with(@xml:id, 'abstract-en')] | t:note[@type='abstract']">
-            <div class="tei-desc text abstract">
-                <xsl:apply-templates select="t:desc[@type='abstract' or starts-with(@xml:id, 'abstract-en')][1] | t:note[@type='abstract']"/>
-            </div>
+            <xsl:choose>
+                <xsl:when test="$collection = 'johnofephesusPlace'">
+                    <xsl:if test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/johnofephesus/places')]">
+                        <div class="tei-desc text abstract">
+                            <xsl:apply-templates select="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/johnofephesus/places')]"/>
+                        </div>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:when test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/places')]">
+                    <div class="tei-desc text abstract">
+                        <xsl:apply-templates select="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/places')]"/>    
+                    </div>
+                </xsl:when>
+                <xsl:otherwise>
+                    <div class="tei-desc text abstract">
+                        <xsl:apply-templates select="t:desc[@type='abstract' or starts-with(@xml:id, 'abstract-en')][1] | t:note[@type='abstract'][1]"/>
+                    </div>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:if>
         <xsl:if test="t:placeName">
             <div id="placenames" class="content-block">
@@ -817,8 +863,22 @@
         </xsl:if>
         
         <xsl:if test="not(empty(t:note[not(@type='description')][1]))">
-            <h3>Notes</h3>
-            <xsl:apply-templates select="t:note[not(@type='description')]"/>
+            <xsl:choose>
+                <xsl:when test="$collection = 'johnofephesusPlace'">
+                    <xsl:if test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/johnofephesus/places')]">
+                        <h3>Notes</h3>
+                        <xsl:apply-templates select="t:note[not(@type='description')][not(contains(@corresp,'http://syriaca.org/johnofephesus/places'))]"/>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:when test="t:note[@type='abstract'][contains(@corresp,'http://syriaca.org/places')]">
+                    <h3>Notes</h3>
+                    <xsl:apply-templates select="t:note[not(@type='description')][not(contains(@corresp,'http://syriaca.org/places'))]"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <h3>Notes</h3>
+                    <xsl:apply-templates select="t:note[not(@type='description')]"/>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:if>
         <!-- Confessions/Religious Communities -->
         <xsl:if test="t:state[@type='confession'][parent::t:place]">
@@ -2235,4 +2295,4 @@
         <xsl:sequence select="local:add-footnotes(@source,.)"/>
     </xsl:template>
     
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file