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

diff --git a/bibframe/xsl/briefDisplay.xsl b/bibframe/xsl/briefDisplay.xsl
index aa1dac3..5a931c9 100644
--- a/bibframe/xsl/briefDisplay.xsl
+++ b/bibframe/xsl/briefDisplay.xsl
@@ -13,29 +13,55 @@
 
   <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:resource"/>
+	    name="resource" select="@rdf:nodeID"/>
 	<tr>
 	  <td><b>Creator:</b></td>
 	  <td>
-	    <xsl:value-of select="//*[@rdf:about=$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:resource"/>
+      <xsl:for-each select="bf:Work[1]/bf:workTitle">
 	<tr>
 	  <td><b>Work Title:</b></td>
 	  <td>
-	    <xsl:value-of select="//*[@rdf:about=$resource]/bf:titleValue"/>
+	    <xsl:call-template name="show-value"/>
 	  </td>
 	</tr>
       </xsl:for-each>
-      <xsl:for-each select="bf:Instance/bf:providerStatement">
+      <xsl:for-each select="bf:Instance[1]/bf:providerStatement">
 	<tr>
 	  <td><b>Date/Place:</b></td>
 	  <td>
@@ -69,7 +95,7 @@
 
   <xsl:template match="zr:explain">
     <xsl:call-template name="diagnostic"/>
-    <xsl:call-template name="searchform1"/>
+    <xsl:call-template name="searchform-simple"/>
   </xsl:template>
 
   <xsl:template match="srw:searchRetrieveResponse">
@@ -92,7 +118,7 @@
     </div>
   </xsl:template>
 
-  <xsl:template name="searchform1">
+  <xsl:template name="searchform-simple">
     <div class="searchform">
       <form name="searchform"  method="get"> <!-- action=".." -->
         <input type="hidden" name="version" value="1.2"/>
@@ -114,7 +140,7 @@
     </div>
   </xsl:template>
 
-  <xsl:template name="searchform2">
+  <xsl:template name="searchform-full">
     <div class="searchform">
       <form name="searchform"  method="get"> <!-- action=".." -->
         <input type="hidden" name="version" value="1.2"/>
@@ -197,7 +223,37 @@
     </xsl:for-each>
   </xsl:template>
 
-  <xsl:template name="new-search">
+  <xsl:template name="searchform-refine">
+    <div class="searchform">
+      <form name="searchform"  method="get"> <!-- action=".." -->
+	<input type="hidden" name="version">
+	  <xsl:attribute name="value">
+	    <xsl:value-of
+		select="//srw:echoedSearchRetrieveRequest/srw:version"/>
+	  </xsl:attribute>
+	</input>
+	<input type="hidden" name="stylesheet">
+	  <xsl:attribute name="value">
+	    <xsl:value-of
+		select="//srw:echoedSearchRetrieveRequest/srw:stylesheet"/>
+	  </xsl:attribute>
+	</input>
+	<input type="text" name="query">
+	  <xsl:attribute name="value">
+	    <xsl:value-of
+		select="//srw:echoedSearchRetrieveRequest/srw:query"/>
+	  </xsl:attribute>
+	</input>
+	<input name="operation" value="searchRetrieve" type="hidden"/>
+	<input name="startRecord" value="1" type="hidden"/>
+	<input name="maximumRecords" value="10" type="hidden"/>
+	<input name="recordSchema" value="bibframe" type="hidden"/>
+	<input type="submit" value="submit"/>
+      </form>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="new-search-link">
     <form name="newsearch" method="get">
       <input type="hidden" name="version">
 	<xsl:attribute name="value">
@@ -282,7 +338,7 @@
         </h4>
       </xsl:for-each>
 
-      <xsl:call-template name="new-search"/>
+      <xsl:call-template name="searchform-refine"/>
 
       <xsl:call-template name="next-records"/>