Changeset 25736

Timestamp:

2012-06-05T10:12:30+12:00 (12 years ago)

Author:

sjm84

Message:

Hopefully fixed searching, also the search form remains on the page after the search

File:

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

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

@@ -20 +20 @@
     <!-- the page content -->
     <xsl:template match="/page">
-        <xsl:choose>
-            <xsl:when test="not(pageResponse/documentNodeList)">
-                <xsl:call-template name="queryPage"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="resultsPage"/>
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:call-template name="queryPage"/>
+        <xsl:call-template name="resultsPage"/>
     </xsl:template>
     
@@ -136 +130 @@
                     <input type="hidden" name="sa"><xsl:attribute name="value"><xsl:value-of select="/page/pageRequest/@subaction"/></xsl:attribute></input>
                     <input type="hidden" name="rt" value="rd"/>
-                    <!--<xsl:if test="not(paramList/param[@name='s1.startPage'])">
-                        <input type="hidden" name="s1.startPage" value="1"/>
-                    </xsl:if>-->
                     <xsl:choose>
                         <xsl:when test="/page/pageRequest/paramList/param[@name = 's1.maxDocs']">
@@ -186 +177 @@
                         </xsl:choose>
                     </xsl:for-each>
-
                     <br/>
-
                     <input type="submit"><xsl:attribute name="value"><xsl:value-of select="displayItem[@name='submit']"/></xsl:attribute></input>
-
                 </div>
             </form>
@@ -200 +188 @@
         <xsl:variable name="currentPage">
             <xsl:choose>
+                <xsl:when test="/page/pageRequest/paramList/param[@name='s1.startPage']/@value">
+                    <xsl:value-of select="/page/pageRequest/paramList/param[@name='s1.startPage']/@value" />
+                </xsl:when>
                 <xsl:when test="/page/pageRequest/paramList/param[@name='startPage']/@value">
                     <xsl:value-of select="/page/pageRequest/paramList/param[@name='startPage']/@value" />
-                </xsl:when>
-                <xsl:when test="/page/pageRequest/paramList/param[@name='s1.startPage']/@value">
-                    <xsl:value-of select="/page/pageRequest/paramList/param[@name='s1.startPage']/@value" />
                 </xsl:when>
                 <xsl:otherwise>1</xsl:otherwise>
@@ -212 +200 @@
         <xsl:variable name="usesS1">
             <xsl:choose>
-                <xsl:when test="/page/pageRequest/paramList/param[@name='s1.startPage']">true</xsl:when>
+                <xsl:when test="/page/pageResponse/service/paramList/param[@name='startPage']">true</xsl:when>
                 <xsl:otherwise>false</xsl:otherwise>
             </xsl:choose>