Show
Ignore:
Timestamp:
09.05.2011 14:37:04 (8 years ago)
Author:
sjm84
Message:

Updating this branch to match the latest Greenstone3 changes

Location:
main/branches/64_bit_Greenstone/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/branches/64_bit_Greenstone/greenstone3

  • main/branches/64_bit_Greenstone/greenstone3/web/interfaces/default/transform/querytools.xsl

    r18316 r24007  
    33  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
    44  xmlns:java="http://xml.apache.org/xslt/java" 
    5   xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil" 
    6   extension-element-prefixes="java util" 
    7   exclude-result-prefixes="java util"> 
     5  extension-element-prefixes="java" 
     6  exclude-result-prefixes="java"> 
    87 
    98  <!-- have changed this so it uses service hitsPerPage and startPage if the service description has a param called hitsPerPage,  otherwise uses interface ones --> 
     
    6160    <div>    
    6261      <div> 
    63         <xsl:if test="$here &gt; 1"><a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&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> 
     62        <xsl:if test="$here &gt; 1"><a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&amp;{$page-param}={$prev}"><img src="interfaces/default/images/less.gif" width='30' height='16' border='0' align='top'/><span class="getTextFor query.matches"></span><xsl:text> </xsl:text><xsl:value-of select="number(($prev - 1)*$hpp + 1)"/> - <xsl:value-of select="number(($prev * $hpp))"/></a></xsl:if> 
    6463         
    6564         
     
    6766          <xsl:variable name='m' select="number($next * $hpp)"/> 
    6867          <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> 
    69           <a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&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></div> 
     68          <a href="{$library_name}?a=q&amp;sa={$sa}&amp;c={$collName}&amp;s={$service}&amp;rt=rd&amp;{$page-param}={$next}"><span class="getTextFor query.matches"></span><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></div> 
    7069    </div> 
    7170      </xsl:if> 
     
    8079      <xsl:choose> 
    8180    <xsl:when test="$numDocsMatched='0' or $numDocsReturned='0'"> 
    82       <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.nodocsmatch')"/> 
     81        <span class="getTextFor query.nodocsmatch"></span> 
    8382    </xsl:when> 
    8483    <xsl:when test="$numDocsMatched='1' or $numDocsReturned='1'"> 
    85       <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.onedocsmatch')"/> 
     84        <span class="getTextFor query.onedocsmatch"></span> 
    8685    </xsl:when> 
    8786    <xsl:when test="$numDocsMatched"> 
    88       <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.manydocsmatch', $numDocsMatched)"/> 
    89       <xsl:if test="$numDocsReturned"> (<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.docsreturned', $numDocsReturned)"/>)</xsl:if> 
     87      <span><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.query.manydocsmatch|', $numDocsMatched)"/></xsl:attribute></span> 
     88      <xsl:if test="$numDocsReturned"> (<span><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.query.docsreturned|', $numDocsReturned)" /></xsl:attribute></span>)</xsl:if> 
    9089    </xsl:when> 
    9190    <xsl:when test="$numDocsReturned"> 
    92       <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.atleastdocsmatch', $numDocsReturned)"/> 
     91      <span><xsl:attribute name="class"><xsl:value-of select="concat('getTextFor null this.innerText.query.atleastdocsmatch|', $numDocsReturned)" /></xsl:attribute></span> 
    9392    </xsl:when> 
    9493      </xsl:choose> 
     
    136135    <xsl:param name="serviceName"/> 
    137136    <a><xsl:attribute name="href"><xsl:value-of select='$library_name'/>?a=d&amp;c=<xsl:value-of select='$collName'/>&amp;d=<xsl:value-of select='@nodeID'/><xsl:if test="@nodeType='leaf'">&amp;sib=1</xsl:if>&amp;dt=<xsl:value-of select='@docType'/>&amp;p.a=q&amp;&amp;p.sa=<xsl:value-of select="/page/pageRequest/@subaction"/>&amp;p.s=<xsl:value-of select="$serviceName"/></xsl:attribute> 
    138       <xsl:apply-templates select="." mode="displayNodeIcon"/> 
     137      <xsl:apply-templates select="." mode="displayNodeIcon"/><xsl:text>sample</xsl:text> 
    139138    </a> 
    140     <span><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/></span> 
     139    <span><xsl:text>Testing</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name='Title']"/></span> 
    141140  </xsl:template> 
    142141 
     
    144143    <div class="terminfo"> 
    145144      <xsl:if test="count(termList/term) > 0"> 
    146     <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.wordcount')"/> 
     145      <span class="getTextFor query.wordcount">&amp;nbsp;</span> 
    147146    <xsl:for-each select="termList/term"> 
    148147      <xsl:if test="position() > 1">, </xsl:if>