X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=bibframe%2Fxsl%2FbriefDisplay.xsl;h=0fed59c6e785966513aa6e7f39035f2ac605b986;hb=de5260be2fa0dbe65f663a34deb0581a539247f9;hp=b3953a96f74575f40abea4e443ce3b833dfef60d;hpb=e92dfac9935090b18afe6f1f007a49db5feb0772;p=mp-xquery-moved-to-github.git

diff --git a/bibframe/xsl/briefDisplay.xsl b/bibframe/xsl/briefDisplay.xsl
index b3953a9..0fed59c 100644
--- a/bibframe/xsl/briefDisplay.xsl
+++ b/bibframe/xsl/briefDisplay.xsl
@@ -13,25 +13,51 @@
 
   <xsl:template match="text()"/>
 
+  <xsl:template name="show-value">
+    <xsl:variable name="resource" select="@rdf:resource"/>
+    <xsl:variable name="nodeid" select="@rdf:nodeID"/>
+    <xsl:choose>
+      <xsl:when test="$resource">
+	<xsl:variable name="rvalue"
+		      select="//*[@rdf:about=$resource]/*[1]/text()"/>
+	<xsl:choose>
+	  <xsl:when test="$rvalue">
+	    <xsl:value-of select="$rvalue"/>
+	  </xsl:when>
+	</xsl:choose>
+      </xsl:when>
+      <xsl:when test="$nodeid">
+	<xsl:variable name="rvalue"
+		      select="../../..//*[@rdf:nodeID=$nodeid]/*[1]"/>
+	<xsl:choose>
+	  <xsl:when test="$rvalue">
+	    <xsl:value-of select="$rvalue"/>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:value-of select="$nodeid"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="rdf:RDF">
     <table>
       <xsl:for-each select="bf:Work[1]/bf:creator">
 	<xsl:variable
-	    name="resource" select="./@rdf:nodeID"/>
+	    name="resource" select="@rdf:nodeID"/>
 	<tr>
 	  <td><b>Creator:</b></td>
 	  <td>
-	    <xsl:value-of select="//*[@rdf:nodeID=$resource]/bf:label"/>
+	    <xsl:call-template name="show-value"/>
 	  </td>
 	</tr>
       </xsl:for-each>
       <xsl:for-each select="bf:Work[1]/bf:workTitle">
-	<xsl:variable
-	    name="resource" select="./@rdf:nodeID"/>
 	<tr>
 	  <td><b>Work Title:</b></td>
 	  <td>
-	    <xsl:value-of select="//*[@rdf:nodeID=$resource]/bf:titleValue"/>
+	    <xsl:call-template name="show-value"/>
 	  </td>
 	</tr>
       </xsl:for-each>