From 62c873eada38b9c06546597d0e792e3bd2a18ec8 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 17 Jan 2017 17:31:57 +0100
Subject: [PATCH] fixes for processing of tei:rs, closes #162

---
 xsl/common_link.xsl | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/xsl/common_link.xsl b/xsl/common_link.xsl
index 12a849923..110b26a30 100644
--- a/xsl/common_link.xsl
+++ b/xsl/common_link.xsl
@@ -5,6 +5,12 @@
         thus exclude all elements with the following child elements 
     -->
     <xsl:variable name="linkableElements" as="xs:string+" select="('persName', 'rs', 'workName', 'characterName', 'orgName', 'sic', 'del', 'add', 'subst', 'damage', 'choice', 'note', 'unclear', 'app')"/>
+    
+    <!--
+        Need to distinguish between docTypes with support for single views and those with tooltips only 
+    -->
+    <xsl:variable name="rs-types-with-link" as="xs:string+" select="('person', 'news', 'writing', 'letter', 'diaryDay', 'org', 'document')"/>
+<!--    <xsl:variable name="rs-types-with-tooltip-only" as="xs:string+" select="('biblio', 'work')"/>-->
 
 
     <!--  *********************************************  -->
@@ -23,23 +29,15 @@
 
     <xsl:template match="tei:rs">
         <xsl:choose>
-            <xsl:when test="$suppressLinks">
+            <xsl:when test="@key and not($suppressLinks) and (@type=$rs-types-with-link)">
+                <xsl:call-template name="createLink"/>
+            </xsl:when>
+            <xsl:when test="@key and not($suppressLinks) and not(@type=$rs-types-with-link)">
                 <xsl:call-template name="createSpan"/>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:choose>
-                    <xsl:when test="matches(@type, '.+[yrnkg]s$|newsPl$')">
-                        <!-- Pluralformen werden aktuell noch ausgespart-->
-                        <xsl:call-template name="createSpan"/>
-                    </xsl:when>
-                    <xsl:when test="matches(@type, 'work|biblio')">
-                        <!-- Für Werke und Bibliographische Objekte gibt es aktuell noch keine Einzelansicht, lediglich einen Tooltip -->
-                        <xsl:call-template name="createSpan"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:call-template name="createLink"/>
-                    </xsl:otherwise>
-                </xsl:choose>
+                <!--<xsl:call-template name="createSpan"/>-->
+                <xsl:apply-templates/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
@@ -101,7 +99,8 @@
                 </xsl:element>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:apply-templates/>
+                <!--<xsl:apply-templates/>-->
+                <xsl:call-template name="createSpan"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>