X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=bibframe%2Fxsl%2FbriefDisplay.xsl;h=5a931c9bbe6757ec0ce6133d48eaf241e926d5b6;hb=02298f9c990d64add5fe716e7cb61a48a637f022;hp=eb1a544cfab6b88de2d92137b362c70347808696;hpb=f5c35b2ae658ccbe20afd6552659117db40a623a;p=mp-xquery-moved-to-github.git

diff --git a/bibframe/xsl/briefDisplay.xsl b/bibframe/xsl/briefDisplay.xsl
index eb1a544..5a931c9 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/bf:creator">
+      <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/bf:workTitle">
-	<xsl:variable
-	    name="resource" select="./@rdf:nodeID"/>
+      <xsl:for-each select="bf:Work[1]/bf:workTitle">
 	<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>