From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 11 Aug 2014 12:22:37 +0000 (+0200)
Subject: usebnodes=true and update XSLs due to different output
X-Git-Tag: loc_1~5
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=f5c35b2ae658ccbe20afd6552659117db40a623a;p=mp-xquery-moved-to-github.git

usebnodes=true and update XSLs due to different output

In particular workTitle and creator has ref:nodeID attribute
rather than rdf:resource .
---

diff --git a/bibframe/config.xml b/bibframe/config.xml
index 055a163..899711f 100644
--- a/bibframe/config.xml
+++ b/bibframe/config.xml
@@ -37,6 +37,7 @@
 	<record name="marcxmluri"/>
 	<variable name="serialization" value="rdxml"/>
 	<variable name="baseuri" value="http://id.loc.gov/resources/bibs/"/>
+	<variable name="usebnodes" value="true"/>
       </filter>
       <filter type="record_transform">
 	<retrievalinfo  xmlns="http://indexdata.com/yaz" version="1.0">
diff --git a/bibframe/xsl/briefDisplay.xsl b/bibframe/xsl/briefDisplay.xsl
index e029f97..eb1a544 100644
--- a/bibframe/xsl/briefDisplay.xsl
+++ b/bibframe/xsl/briefDisplay.xsl
@@ -17,21 +17,21 @@
     <table>
       <xsl:for-each select="bf:Work/bf:creator">
 	<xsl:variable
-	    name="resource" select="./@rdf:resource"/>
+	    name="resource" select="./@rdf:nodeID"/>
 	<tr>
 	  <td><b>Creator:</b></td>
 	  <td>
-	    <xsl:value-of select="//*[@rdf:about=$resource]/bf:label"/>
+	    <xsl:value-of select="//*[@rdf:nodeID=$resource]/bf:label"/>
 	  </td>
 	</tr>
       </xsl:for-each>
       <xsl:for-each select="bf:Work/bf:workTitle">
 	<xsl:variable
-	    name="resource" select="./@rdf:resource"/>
+	    name="resource" select="./@rdf:nodeID"/>
 	<tr>
 	  <td><b>Work Title:</b></td>
 	  <td>
-	    <xsl:value-of select="//*[@rdf:about=$resource]/bf:titleValue"/>
+	    <xsl:value-of select="//*[@rdf:nodeID=$resource]/bf:titleValue"/>
 	  </td>
 	</tr>
       </xsl:for-each>
diff --git a/bibframe/xsl/fullDisplay.xsl b/bibframe/xsl/fullDisplay.xsl
index 967f45d..6d1d838 100644
--- a/bibframe/xsl/fullDisplay.xsl
+++ b/bibframe/xsl/fullDisplay.xsl
@@ -19,6 +19,7 @@
 	<tr><td><b><xsl:value-of select="name(.)"/>:</b></td></tr>
 	<xsl:for-each select="./*">
 	  <xsl:variable name="resource" select="./@rdf:resource"/>
+	  <xsl:variable name="nodeid" select="./@rdf:nodeID"/>
 	  <tr>
 	    <td/><td><b><xsl:value-of select="name(.)"/>:</b></td>
 	    <td/><td>
@@ -34,6 +35,18 @@
 		  </xsl:otherwise>
 		</xsl:choose>
 	      </xsl:if>
+	      <xsl:if 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:if>
 	      <xsl:value-of select="."/>
 	    </td>
 	  </tr>