X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bibframe%2Fxsl%2FbriefDisplay.xsl;h=5a931c9bbe6757ec0ce6133d48eaf241e926d5b6;hb=02298f9c990d64add5fe716e7cb61a48a637f022;hp=0decea815dc11dfacba02ba07dc5f93de7b17bcb;hpb=966d7ad90c2401f0272556d46469787fb3652c0a;p=mp-xquery-moved-to-github.git

diff --git a/bibframe/xsl/briefDisplay.xsl b/bibframe/xsl/briefDisplay.xsl
index 0decea8..5a931c9 100644
--- a/bibframe/xsl/briefDisplay.xsl
+++ b/bibframe/xsl/briefDisplay.xsl
@@ -13,36 +13,62 @@
 
   <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:if test="bf:Work/bf:creator">
+      <xsl:for-each select="bf:Work[1]/bf:creator">
 	<xsl:variable
-	    name="resource" select="bf:Work/bf:creator/@rdf:resource"/>
+	    name="resource" select="@rdf:nodeID"/>
 	<tr>
-	  <td>Author</td>
+	  <td><b>Creator:</b></td>
 	  <td>
-	    <xsl:value-of select="//bf:Person[@rdf:about=$resource]/bf:label"/>
+	    <xsl:call-template name="show-value"/>
 	  </td>
 	</tr>
-      </xsl:if>
-      <xsl:if test="bf:Work/bf:workTitle">
-	<xsl:variable
-	    name="resource" select="bf:Work/bf:workTitle/@rdf:resource"/>
+      </xsl:for-each>
+      <xsl:for-each select="bf:Work[1]/bf:workTitle">
+	<tr>
+	  <td><b>Work Title:</b></td>
+	  <td>
+	    <xsl:call-template name="show-value"/>
+	  </td>
+	</tr>
+      </xsl:for-each>
+      <xsl:for-each select="bf:Instance[1]/bf:providerStatement">
 	<tr>
-	  <td>Work Title</td>
+	  <td><b>Date/Place:</b></td>
 	  <td>
-	    <xsl:value-of select="//bf:Title[@rdf:about=$resource]/bf:titleValue"/>
+	    <xsl:value-of select="."/>
 	  </td>
 	</tr>
-      </xsl:if>
-      <xsl:if test="//bf:Instance/bf:providerStatement">
-      <tr>
-	<td>Date/Place</td>
-	<td>
-	  <xsl:value-of select="//bf:Instance/bf:providerStatement"/>
-	</td>
-      </tr>
-      </xsl:if>
+      </xsl:for-each>
     </table>
   </xsl:template>
 
@@ -54,7 +80,7 @@
     <html>
       <head>
         <title>
-          <xsl:value-of select="//zr:explain/zr:databaseInfo/zr:title"/>
+          BIBFRAME demo
         </title>
         <link href="css.css" rel="stylesheet"
               type="text/css" media="screen, all"/>
@@ -68,9 +94,8 @@
   </xsl:template>
 
   <xsl:template match="zr:explain">
-    <xsl:call-template name="dbinfo"/>
     <xsl:call-template name="diagnostic"/>
-    <xsl:call-template name="searchform"/>
+    <xsl:call-template name="searchform-simple"/>
   </xsl:template>
 
   <xsl:template match="srw:searchRetrieveResponse">
@@ -93,7 +118,29 @@
     </div>
   </xsl:template>
 
-  <xsl:template name="searchform">
+  <xsl:template name="searchform-simple">
+    <div class="searchform">
+      <form name="searchform"  method="get"> <!-- action=".." -->
+        <input type="hidden" name="version" value="1.2"/>
+        <input type="hidden" name="operation" value="searchRetrieve"/>
+	<input type="hidden" name="stylesheet">
+	  <xsl:attribute name="value">
+	    <xsl:value-of select="//srw:echoedExplainRequest/srw:stylesheet"/>
+	    <xsl:value-of select="//sru:echoedExplainRequest/sru:stylesheet"/>
+	  </xsl:attribute>
+	</input>
+	<input type="text" name="query"/>
+	<input name="version" value="1.2" type="hidden"/>
+	<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="searchform-full">
     <div class="searchform">
       <form name="searchform"  method="get"> <!-- action=".." -->
         <input type="hidden" name="version" value="1.2"/>
@@ -122,8 +169,8 @@
           </select>
           <xsl:text> recordPacking: </xsl:text>
           <select name="recordPacking">
-            <option value="string">string</option>
             <option value="xml">XML</option>
+            <option value="string">string</option>
           </select>
 
         </div>
@@ -176,6 +223,112 @@
     </xsl:for-each>
   </xsl:template>
 
+  <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">
+	  <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="submit">
+	<xsl:attribute name="value">
+	  <xsl:text>New Query</xsl:text>
+	</xsl:attribute>
+      </input>
+    </form>
+  </xsl:template>
+
+  <xsl:template name="next-records">
+    <xsl:for-each select="srw:nextRecordPosition">
+      <form name="nextlink" method="get">
+	<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">
+	    <xsl:value-of
+		select="//srw:echoedSearchRetrieveRequest/srw:query"/>
+	  </xsl:attribute>
+	</input>
+	<input type="hidden" name="recordPacking">
+	  <xsl:attribute name="value">
+	    <xsl:value-of select="srw:recordPacking"/>
+	  </xsl:attribute>
+	</input>
+	<input type="hidden" name="recordSchema">
+	  <xsl:attribute name="value">
+	    <xsl:value-of
+		select="//srw:echoedSearchRetrieveRequest/srw:recordSchema"/>
+	  </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="hidden" name="startRecord">
+	  <xsl:attribute name="value">
+	    <xsl:value-of select="."/>
+	  </xsl:attribute>
+	</input>
+	<input type="hidden" name="maximumRecords">
+	  <xsl:attribute name="value">
+	    <xsl:value-of
+		select="//srw:echoedSearchRetrieveRequest/srw:maximumRecords"/>
+	  </xsl:attribute>
+	</input>
+	<input type="submit">
+	  <xsl:attribute name="value">
+	    <xsl:text>Next</xsl:text>
+	  </xsl:attribute>
+	</input>
+      </form>
+    </xsl:for-each>
+  </xsl:template>
+
   <xsl:template name="displaysearch">
     <div class="searchresults">
       <xsl:for-each select="srw:numberOfRecords">
@@ -184,24 +337,19 @@
           <xsl:value-of select="."/>
         </h4>
       </xsl:for-each>
-      <xsl:for-each select="srw:nextRecordPosition">
-        <h4>
-          <xsl:text>Next Record Position: </xsl:text>
-          <xsl:value-of select="."/>
-         </h4>
-      </xsl:for-each>
+
+      <xsl:call-template name="searchform-refine"/>
+
+      <xsl:call-template name="next-records"/>
 
       <xsl:for-each select="srw:records">
         <xsl:for-each select="srw:record">
+	  <hr/>
           <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>
@@ -218,9 +366,18 @@
 		  </xsl:when>
 		</xsl:choose>
 	      </xsl:if>
-
+	    </p>
+	  </div>
+	  <table>
+	    <tr>
+	      <td>
 	      <form name="fulllink" 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">
@@ -238,7 +395,7 @@
 		    <xsl:value-of select="srw:recordSchema"/>
 		  </xsl:attribute>
 		</input>
-		<input type="hidden" name="stylesheet" value="/xsl/briefDisplay.xsl"/>
+		<input type="hidden" name="stylesheet" value="/fullDisplay.xsl"/>
 		<input type="hidden" name="startRecord">
 		  <xsl:attribute name="value">
 		    <xsl:value-of select="srw:recordPosition"/>
@@ -252,8 +409,15 @@
 		  </xsl:attribute>
 		</input>
 	      </form>
+	      </td>
+	      <td>
 	      <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">
@@ -284,10 +448,14 @@
 		  </xsl:attribute>
 		</input>
 	      </form>
-	    </p>
-          </div>
+	      </td>
+	    </tr>
+	  </table>
         </xsl:for-each>
       </xsl:for-each>
+
+      <xsl:call-template name="next-records"/>
+
     </div>
   </xsl:template>
 

Author	Creator:	- +
Work Title:	+ +
Work Title	Date/Place:	- +
Date/Place	- -