X-Git-Url: http://git.indexdata.com/?p=mp-xquery-moved-to-github.git;a=blobdiff_plain;f=bibframe%2Fxsl%2FfullDisplay.xsl;h=75d91a3b87751ebcdf142a35cf55f32ed1aef126;hp=e3d10b5fc82effeffb3ff470f3348a9024890881;hb=907cf5ee499a72858b8e63118289ac4930eaf36b;hpb=f5025e560d3194ece0f156358df951978a867d8a

diff --git a/bibframe/xsl/fullDisplay.xsl b/bibframe/xsl/fullDisplay.xsl
index e3d10b5..75d91a3 100644
--- a/bibframe/xsl/fullDisplay.xsl
+++ b/bibframe/xsl/fullDisplay.xsl
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="http://www.loc.gov/standards/sru/bibframe/fullDisplay.xsl"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:srw="http://www.loc.gov/zing/srw/"
 		xmlns:sru="http://docs.oasis-open.org/ns/search-ws/sruResponse"
@@ -14,19 +15,24 @@
   <xsl:template match="text()"/>
 
   <xsl:template match="rdf:RDF">
+  		<xsl:variable name="base" select="bf:Work[1]/@rdf:about"/>
     <table>
       <xsl:for-each select="bf:*">
 	<tr><td><b><xsl:value-of select="name(.)"/>:</b>
-	<xsl:variable name="n" select="./@rdf:nodeID"/>
+	<xsl:variable name="n" select="@rdf:nodeID"/>
 	<xsl:if test="$n">
-	  (<xsl:value-of select="$n"/>)
+	  &#160;(<a name="{$n}"><xsl:value-of select="$n"/></a>)
 	</xsl:if>
+	<xsl:if test="@rdf:about and @rdf:about != $base">
+		<xsl:variable name="bnodedid">
+		<xsl:value-of select="substring-after(@rdf:about, $base)"/>
+	</xsl:variable>&#160;(<a name="{$bnodedid}"><xsl:value-of select="$bnodedid"/></a>)</xsl:if>	
 	</td></tr>
-	<xsl:for-each select="./*">
-	  <xsl:variable name="lang" select="./@xml:lang"/>
-	  <xsl:if test="not($lang='x-bf-hashable')">
-	    <xsl:variable name="resource" select="./@rdf:resource"/>
-	    <xsl:variable name="nodeid" select="./@rdf:nodeID"/>
+	<xsl:for-each select="*">
+	  <xsl:variable name="lang" select="@xml:lang"/>
+	  <xsl:if test="not($lang='x-bf-hash')">
+	    <xsl:variable name="resource" select="@rdf:resource"/>
+	    <xsl:variable name="nodeid" select="@rdf:nodeID"/>
 	    <tr>
 	      <td/>
 	      <td>
@@ -34,15 +40,15 @@
 	      </td>
 	      <td/><td>
 	      <xsl:choose>
-		<xsl:when test="name(.) = 'bf:publication' or name(.) = 'bf:distribution' or name(.) = 'manufacture' or name(.) = 'production' or name(.) = 'provider'">
+		<xsl:when test="bf:Provider">
 		  <xsl:for-each select=".//bf:providerRole">
 		    <xsl:value-of select="."/><br/>
 		  </xsl:for-each>
 		  <xsl:for-each select=".//bf:providerName">
-		    Name: <xsl:value-of select="."/><br/>
+		    <b>Name: </b><xsl:value-of select="."/><br/>
 		  </xsl:for-each>
 		  <xsl:for-each select=".//bf:providerPlace">
-		    Place: <xsl:value-of select="."/><br/>
+		    <b>Place: </b><xsl:value-of select="."/><br/>
 		  </xsl:for-each>
 		  <xsl:for-each select=".//bf:providerDate">
 		    <xsl:value-of select="."/><br/>
@@ -52,12 +58,14 @@
 		  </xsl:for-each>
 		</xsl:when>
 		<xsl:when test="$resource">
-		  <xsl:variable name="rvalue"
-				select="//*[@rdf:about=$resource]/*[1]"/>
+		  <xsl:variable name="rvalue" select="//*[@rdf:about=$resource]/*[1]/text()"/>
 		  <xsl:choose>
-		    <xsl:when test="$rvalue">
-		      <xsl:value-of select="$rvalue"/>
-		    </xsl:when>
+			<xsl:when test="$rvalue">
+				<xsl:value-of select="$rvalue"/>&#160;(<a>
+					<xsl:attribute name="href">
+						<xsl:value-of select="concat('#',substring-after($resource, $base))"/>
+					</xsl:attribute>
+					<xsl:value-of select="substring-after($resource, $base)"/></a>)</xsl:when>
 		    <xsl:otherwise>
 		      <a>
 			<xsl:attribute name="href">
@@ -70,11 +78,11 @@
 		</xsl:when>
 		<xsl:when test="$nodeid">
 		  <xsl:variable name="rvalue"
-				select="//*[@rdf:nodeID=$nodeid]/*[1]"/>
+				select="../../..//*[@rdf:nodeID=$nodeid]/*[1]"/>
 		  <xsl:choose>
 		    <xsl:when test="$rvalue">
 		      <xsl:value-of select="$rvalue"/>
-		      (<xsl:value-of select="$nodeid"/>)
+		      &#160;(<a><xsl:attribute name="href">#<xsl:value-of select="$nodeid"/></xsl:attribute><xsl:value-of select="$nodeid"/>)</a>
 		    </xsl:when>
 		    <xsl:otherwise>
 		      <xsl:value-of select="$nodeid"/>
@@ -83,6 +91,10 @@
 		</xsl:when>
 		<xsl:when test="bf:Identifier">
 		  <xsl:for-each select="bf:Identifier/*">
+		    <b>
+		      <xsl:value-of
+			  select="substring-after(name(.),'bf:identifier')"/>:
+		    </b>
 		    <xsl:value-of select="."/><br/>
 		  </xsl:for-each>
 		</xsl:when>
@@ -108,6 +120,7 @@
         <title>BIBFRAME Full Display</title>
         <link href="css.css" rel="stylesheet"
               type="text/css" media="screen, all"/>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
       </head>
       <body>
         <div class="body">
@@ -211,4 +224,4 @@
     </div>
   </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file