#68: move direct link rendering to ead:did

discoverygarden · Oct 5, 2021 · a09eeea · a09eeea
1 parent af72881
commit a09eeea
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/transforms/ead_to_html.xslt b/transforms/ead_to_html.xslt
@@ -82,6 +82,16 @@
       <dl>
         <xsl:copy-of select="$contents"/>
       </dl>
+      <xsl:if test="count(ead:dao[@xlink:href])">
+        <xsl:variable name="xlinks">
+          <xsl:call-template name="ead_dao_xlink" />
+        </xsl:variable>
+        <xsl:if test="normalize-space($xlinks)">
+          <ul class="ead_daos">
+            <xsl:copy-of select="$xlinks" />
+          </ul>
+        </xsl:if>
+      </xsl:if>
     </xsl:if>
   </xsl:template>
 
@@ -172,16 +182,6 @@
         <xsl:apply-templates select="." mode="parent_text"/>
       </xsl:otherwise>
       </xsl:choose>
-      <xsl:if test="count(../ead:dao[@xlink:href])">
-        <xsl:variable name="contents">
-          <xsl:call-template name="ead_dao_xlink" />
-        </xsl:variable>
-        <xsl:if test="normalize-space($contents)">
-          <ul class="ead_daos">
-            <xsl:copy-of select="$contents" />
-          </ul>
-        </xsl:if>
-      </xsl:if>
     </dd>
   </xsl:template>
 
@@ -200,7 +200,7 @@
   </xsl:template>
 
   <xsl:template name="ead_dao_xlink">
-    <xsl:for-each select="../ead:dao[@xlink:href]">
+    <xsl:for-each select="ead:dao[@xlink:href]">
     <xsl:variable name="direct_url">
       <xsl:if test="$call_direct_link = 'true'">
         <xsl:value-of select="php:function('islandora_manuscript_build_direct_url', @xlink:href)" />