Changeset 26084
- Timestamp:
- 2012-08-08T16:17:00+12:00 (12 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java
r25761 r26084 694 694 695 695 //Add custom HTTP headers if requested 696 String httpHeadersParam = request.getParameter(GSParams.HTTP HEADERFIELDS);696 String httpHeadersParam = request.getParameter(GSParams.HTTP_HEADER_FIELDS); 697 697 if (httpHeadersParam != null && httpHeadersParam.length() > 0) 698 698 { -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java
r25937 r26084 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 48 48 49 public static final String HTTPHEADERFIELDS = "hhf"; 49 public static final String HTTP_HEADER_FIELDS = "hhf"; 50 public static final String QUICK_SEARCH = "qs"; 50 51 51 52 // internal configure args … … 96 97 addParameter(DOCUMENT, true); 97 98 addParameter(DOCUMENT_TYPE, false); 99 addParameter(QUICK_SEARCH, false); 98 100 addParameter(START_PAGE, false); 99 101 addParameter(S_START_PAGE, false); -
main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl
r26083 r26084 364 364 <div id="quicksearcharea"> 365 365 <form action="{$library_name}/collection/{$collNameChecked}/search/TextQuery"> 366 <input type="hidden" name="rt" value="r"/> 366 <!-- This parameter says that we have come from the quick search area --> 367 <input type="hidden" name="qs" value="1"/> 368 <input type="hidden" name="rt" value="rd"/> 367 369 <input type="hidden" name="s1.level"> 368 370 <xsl:attribute name="value"> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl
r26049 r26084 21 21 <!-- the page content --> 22 22 <xsl:template match="/page"> 23 <xsl:call-template name="queryPage"/> 23 <xsl:if test="not(/page/pageRequest/paramList/param[@name = 'qs']) or /page/pageRequest/paramList/param[@name = 'qs']/@value = ''"> 24 <xsl:call-template name="queryPage"/> 25 </xsl:if> 24 26 <xsl:call-template name="resultsPage"/> 25 27 </xsl:template> … … 309 311 <td id="prevArrowTD"> 310 312 <xsl:if test="$currentPage != 1"> 311 <a href="{$library_name}?a=q&sa={/page/pageRequest/@subaction}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage - 1} ">313 <a href="{$library_name}?a=q&sa={/page/pageRequest/@subaction}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage - 1}&qs={/page/pageRequest/paramList/param[@name='qs']/@value}"> 312 314 <img src="interfaces/default/images/previous.png"/> 313 315 </a> … … 316 318 <td id="prevTD"> 317 319 <xsl:if test="$currentPage != 1"> 318 <a href="{$library_name}?a=q&sa={/page/pageRequest/@subaction}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage - 1} ">Previous</a>320 <a href="{$library_name}?a=q&sa={/page/pageRequest/@subaction}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage - 1}&qs={/page/pageRequest/paramList/param[@name='qs']/@value}">Previous</a> 319 321 </xsl:if> 320 322 </td> … … 373 375 <td id="nextTD"> 374 376 <xsl:if test="($currentPage * $docsPerPage + 1) < $docMax"> 375 <a href="{$library_name}?a=q&sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage + 1} ">Next</a>377 <a href="{$library_name}?a=q&sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage + 1}&qs={/page/pageRequest/paramList/param[@name='qs']/@value}">Next</a> 376 378 </xsl:if> 377 379 </td> 378 380 <td id="nextArrowTD"> 379 381 <xsl:if test="($currentPage * $docsPerPage + 1) < $docMax"> 380 <a href="{$library_name}?a=q&sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage + 1} ">382 <a href="{$library_name}?a=q&sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&c={$collName}&s={/page/pageResponse/service/@name}&rt=rd&{$startPageName}={$currentPage + 1}&qs={/page/pageRequest/paramList/param[@name='qs']/@value}"> 381 383 <img src="interfaces/default/images/next.png"/> 382 384 </a>
Note:
See TracChangeset
for help on using the changeset viewer.