Changeset 33209 for main

Timestamp:

2019-06-24T11:27:53+12:00 (5 years ago)

Author:

kjdon

Message:

don't add 1 to currentpage * docsperpage. otherwise you miss the final document

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl

@@ -540 +540 @@
           <xsl:call-template name="documentLevel"/>
         </xsl:variable>
-        
         <!-- we only need this if number of docs > docsperpage -->
         <xsl:if test="$docMax &gt; $docsPerPage">
@@ -594 +593 @@
                 <!-- Next button -->
                 <td id="nextTD">
-                    <xsl:if test="$docsPerPage &gt; 0 and ($currentPage * $docsPerPage + 1) &lt; $docMax">
+                    <xsl:if test="$docsPerPage &gt; 0 and ($currentPage * $docsPerPage) &lt; $docMax">
                         <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.results.next')"/></a>
                     </xsl:if>
                 </td>
                 <td id="nextArrowTD">
-                    <xsl:if test="$docsPerPage &gt; 0 and ($currentPage * $docsPerPage + 1) &lt; $docMax">
+                    <xsl:if test="$docsPerPage &gt; 0 and ($currentPage * $docsPerPage) &lt; $docMax">
                         <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">
                             <xsl:call-template name="nextArrowImage"/>