Changeset 9009 for trunk/gsdl3/web

Timestamp:

2005-02-10T17:02:37+13:00 (19 years ago)

Author:

kjdon

Message:

added param collName to resultNavigation template - can't necessarily assume that the currently set coll var is the right one.

Location:

trunk/gsdl3/web/interfaces/default/transform

Files:

• query.xsl (modified) (2 diffs)
• querytools.xsl (modified) (3 diffs)

trunk/gsdl3/web/interfaces/default/transform/query.xsl

@@ -57 +57 @@
     
     <!-- next and prev links at top of results-->
-    <xsl:call-template name="resultNavigation"/>
+    <xsl:call-template name="resultNavigation">
+      <xsl:with-param name="collName" select="$collName"/>
+    </xsl:call-template>
     <!-- Display the matching documents -->
     <xsl:call-template name="resultList">
@@ -63 +65 @@
     </xsl:call-template>
     <!-- next and prev links at bottom of page -->
-    <xsl:call-template name="resultNavigation"/>
+    <xsl:call-template name="resultNavigation">
+      <xsl:with-param name="collName" select="$collName"/>
+    </xsl:call-template>
   </xsl:template>
   

trunk/gsdl3/web/interfaces/default/transform/querytools.xsl

@@ -9 +9 @@
   <!-- have changed this so it uses service hitsPerPage and startPage if the service description has a param called hitsPerPage,  otherwise uses interface ones -->
   <xsl:template name="resultNavigation">
+    <xsl:param name="collName"/>
     <!-- hits type -->
     <xsl:variable name='ht'>
@@ -61 +62 @@
       <tr>
         <td align='left'>
-          <xsl:if test="$here &gt; 1"><a href="{$library_name}?a=q&amp;sa={$sa}&amp;s={$service}&amp;rt=r&amp;{$page-param}={$prev}"><img src="interfaces/default/images/less.gif" width='30' height='16' border='0' align='top'/><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.matches')"/><xsl:text> </xsl:text><xsl:value-of select="number(($prev - 1)*$hpp + 1)"/> - <xsl:value-of select="number(($prev * $hpp))"/></a></xsl:if>
+          <xsl:if test="$here &gt; 1"><a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=r&amp;{$page-param}={$prev}"><img src="interfaces/default/images/less.gif" width='30' height='16' border='0' align='top'/><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.matches')"/><xsl:text> </xsl:text><xsl:value-of select="number(($prev - 1)*$hpp + 1)"/> - <xsl:value-of select="number(($prev * $hpp))"/></a></xsl:if>
         </td>
         <td align='right'>
@@ -67 +68 @@
         <xsl:variable name='m' select="number($next * $hpp)"/>
         <xsl:variable name='mm'><xsl:choose><xsl:when test="$m &lt; $td"><xsl:value-of select='$m'/></xsl:when><xsl:otherwise><xsl:value-of select='$td'/></xsl:otherwise></xsl:choose></xsl:variable>
-        <a href="{$library_name}?a=q&amp;sa={$sa}&amp;s={$service}&amp;rt=r&amp;{$page-param}={$next}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.matches')"/><xsl:text> </xsl:text><xsl:value-of select="number(($next - 1)*$hpp + 1)"/> - <xsl:value-of select="$mm"/><img src="interfaces/default/images/more.gif" width='30' height='16' border='0' align='top'/></a></xsl:if></td> </tr>
+        <a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=r&amp;{$page-param}={$next}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.matches')"/><xsl:text> </xsl:text><xsl:value-of select="number(($next - 1)*$hpp + 1)"/> - <xsl:value-of select="$mm"/><img src="interfaces/default/images/more.gif" width='30' height='16' border='0' align='top'/></a></xsl:if></td> </tr>
     </table>
       </center>