X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=bibframe%2Fxsl%2FfullDisplay.xsl;h=2c041436b46b9c8f5e91106a704d30985bb0cec9;hb=e0f7132d39634b032c3f1de9600be33bd833d7d5;hp=9245e852ece5f9db77ea1677f4bbc6433794d48c;hpb=60cb339cf1a18ea8e7b4521084727b77d9fe5d19;p=mp-xquery-moved-to-github.git

diff --git a/bibframe/xsl/fullDisplay.xsl b/bibframe/xsl/fullDisplay.xsl
index 9245e85..2c04143 100644
--- a/bibframe/xsl/fullDisplay.xsl
+++ b/bibframe/xsl/fullDisplay.xsl
@@ -16,27 +16,64 @@
   <xsl:template match="rdf:RDF">
     <table>
       <xsl:for-each select="bf:*">
-	<tr><td><xsl:value-of select="name(.)"/></td></tr>
+	<tr><td><b><xsl:value-of select="name(.)"/>:</b>
+	<xsl:variable name="n" select="./@rdf:nodeID"/>
+	<xsl:if test="$n">
+	  (<xsl:value-of select="$n"/>)
+	</xsl:if>
+	</td></tr>
 	<xsl:for-each select="./*">
-	  <xsl:variable name="resource" select="./@rdf:resource"/>
-	  <tr>
-	    <td/><td><xsl:value-of select="name(.)"/></td>
-	    <td/><td>
-	      <xsl:if test="$resource">
-		<xsl:variable name="rvalue"
-			      select="//*[@rdf:about=$resource]/*[1]"/>
-		<xsl:choose>
-		  <xsl:when test="$rvalue">
-		    <xsl:value-of select="$rvalue"/>
-		  </xsl:when>
-		  <xsl:otherwise>
-		    <xsl:value-of select="$resource"/>
-		  </xsl:otherwise>
-		</xsl:choose>
-	      </xsl:if>
-	      <xsl:value-of 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"/>
+	    <tr>
+	      <td/>
+	      <td>
+		<b><xsl:value-of select="name(.)"/>:</b>
+	      </td>
+	      <td/><td>
+	      <xsl:choose>
+		<xsl:when test="$resource">
+		  <xsl:variable name="rvalue"
+				select="//*[@rdf:about=$resource]/*[1]"/>
+		  <xsl:choose>
+		    <xsl:when test="$rvalue">
+		      <xsl:value-of select="$rvalue"/>
+		    </xsl:when>
+		    <xsl:otherwise>
+		      <a>
+			<xsl:attribute name="href">
+			  <xsl:value-of select="$resource"/>
+			</xsl:attribute>
+			<xsl:value-of select="$resource"/>
+		      </a>
+		    </xsl:otherwise>
+		  </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:value-of select="$nodeid"/>)
+		    </xsl:when>
+		    <xsl:otherwise>
+		      <xsl:value-of select="$nodeid"/>
+		    </xsl:otherwise>
+		  </xsl:choose>
+		</xsl:when>
+		<xsl:when test="bf:Identifier">
+		  <xsl:value-of select="bf:Identifier/bf:identifierValue"/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select="."/>
+		</xsl:otherwise>
+	      </xsl:choose>
 	    </td>
-	  </tr>
+	    </tr>
+	  </xsl:if>
 	</xsl:for-each>
       </xsl:for-each>
     </table>
@@ -49,7 +86,7 @@
   <xsl:template name="html">
     <html>
       <head>
-        <title>Full Display</title>
+        <title>BIBFRAME Full Display</title>
         <link href="css.css" rel="stylesheet"
               type="text/css" media="screen, all"/>
       </head>
@@ -90,14 +127,10 @@
       <xsl:for-each select="srw:records">
         <xsl:for-each select="srw:record">
           <div class="record">
-            <p>
-              <xsl:text>Record: </xsl:text>
+            <h4>
+              <xsl:text>Record </xsl:text>
               <xsl:value-of select="srw:recordPosition"/>
-              <xsl:text> : </xsl:text>
-              <xsl:value-of select="srw:recordSchema"/>
-              <xsl:text> : </xsl:text>
-              <xsl:value-of select="srw:recordPacking"/>
-	    </p>
+	    </h4>
             <p>
 	      <xsl:if test="srw:recordPacking='string'">
 		<pre>
@@ -116,7 +149,12 @@
 	      </xsl:if>
 
 	      <form name="rawlink" method="get">
-		<input type="hidden" name="version" value="1.2"/>
+		<input type="hidden" name="version">
+		  <xsl:attribute name="value">
+		    <xsl:value-of
+			select="//srw:echoedSearchRetrieveRequest/srw:version"/>
+		  </xsl:attribute>
+		</input>
 		<input type="hidden" name="operation" value="searchRetrieve"/>
 		<input type="hidden" name="query">
 		  <xsl:attribute name="value">


: + + + () + +
		- - - - - - - - - - - - + + + + +
+	+ : +	+ + + + + + + + + + + + + + + + + + + + + + + () + + + + + + + + + + + + +