Changeset 26084

Timestamp:

2012-08-08T16:17:00+12:00 (12 years ago)

Author:

sjm84

Message:

Changed the way we hide the search area when a user performs a text search as the previous approach was causing the next and previous buttons to stop working

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (1 diff)
• src/java/org/greenstone/gsdl3/util/GSParams.java (modified) (2 diffs)
• web/interfaces/default/transform/layouts/header.xsl (modified) (1 diff)
• web/interfaces/default/transform/pages/query.xsl (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -694 +694 @@
 
         //Add custom HTTP headers if requested
-        String httpHeadersParam = request.getParameter(GSParams.HTTPHEADERFIELDS);
+        String httpHeadersParam = request.getParameter(GSParams.HTTP_HEADER_FIELDS);
         if (httpHeadersParam != null && httpHeadersParam.length() > 0)
         {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java

@@ -47 +47 @@
     public static final String PROCESS_ID = "pid"; // if a request wasn't completed, this identifies the request - used when asking for a status update
 
-    public static final String HTTPHEADERFIELDS = "hhf";
+    public static final String HTTP_HEADER_FIELDS = "hhf";
+    public static final String QUICK_SEARCH = "qs";
 
     // internal configure args
@@ -96 +97 @@
         addParameter(DOCUMENT, true);
         addParameter(DOCUMENT_TYPE, false);
+        addParameter(QUICK_SEARCH, false);
         addParameter(START_PAGE, false);
         addParameter(S_START_PAGE, false);

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -364 +364 @@
             <div id="quicksearcharea">
                 <form action="{$library_name}/collection/{$collNameChecked}/search/TextQuery">
-                    <input type="hidden" name="rt" value="r"/>
+                    <!-- This parameter says that we have come from the quick search area -->
+                    <input type="hidden" name="qs" value="1"/>
+                    <input type="hidden" name="rt" value="rd"/>
                     <input type="hidden" name="s1.level">
                         <xsl:attribute name="value">

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

@@ -21 +21 @@
     <!-- the page content -->
     <xsl:template match="/page">
-        <xsl:call-template name="queryPage"/>
+        <xsl:if test="not(/page/pageRequest/paramList/param[@name = 'qs']) or /page/pageRequest/paramList/param[@name = 'qs']/@value = ''">
+            <xsl:call-template name="queryPage"/>
+        </xsl:if>
         <xsl:call-template name="resultsPage"/>
     </xsl:template>
@@ -309 +311 @@
             <td id="prevArrowTD">
                 <xsl:if test="$currentPage != 1">
-                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}">
+                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&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}">
                         <img src="interfaces/default/images/previous.png"/>
                     </a>
@@ -316 +318 @@
             <td id="prevTD">
                 <xsl:if test="$currentPage != 1">
-                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}">Previous</a>
+                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&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}">Previous</a>
                 </xsl:if>
             </td>
@@ -373 +375 @@
             <td id="nextTD">
                 <xsl:if test="($currentPage * $docsPerPage + 1) &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}">Next</a>
+                    <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}">Next</a>
                 </xsl:if>
             </td>
             <td id="nextArrowTD">
                 <xsl:if test="($currentPage * $docsPerPage + 1) &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}">
+                    <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}">
                         <img src="interfaces/default/images/next.png"/>
                     </a>