X-Git-Url: http://git.indexdata.com/?p=mp-xquery-moved-to-github.git;a=blobdiff_plain;f=bibframe%2Fxsl%2FfullDisplay.xsl;fp=bibframe%2Fxsl%2FfullDisplay.xsl;h=2c041436b46b9c8f5e91106a704d30985bb0cec9;hp=6d1d838c5472aa093354e8815751ab29861058a1;hb=e0f7132d39634b032c3f1de9600be33bd833d7d5;hpb=e92dfac9935090b18afe6f1f007a49db5feb0772

diff --git a/bibframe/xsl/fullDisplay.xsl b/bibframe/xsl/fullDisplay.xsl
index 6d1d838..2c04143 100644
--- a/bibframe/xsl/fullDisplay.xsl
+++ b/bibframe/xsl/fullDisplay.xsl
@@ -16,40 +16,64 @@
   <xsl:template match="rdf:RDF">
     <table>
       <xsl:for-each select="bf:*">
-	<tr><td><b><xsl:value-of select="name(.)"/>:</b></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"/>
-	  <xsl:variable name="nodeid" select="./@rdf:nodeID"/>
-	  <tr>
-	    <td/><td><b><xsl:value-of select="name(.)"/>:</b></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: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="."/>
+	  <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>