Changeset 29275

Show
Ignore:
Timestamp:
11.09.2014 21:11:11 (5 years ago)
Author:
ak19
Message:

Kathy discovered that that the total number of docs found is mentioned for solr collections when reporting the term frequencies for more than 1 term. This is wrong, because for collections built with other indexers, the number of docs found is reported per term along with that term's term frequency. Not sure at present how to compute the number of docs found per term for solr collections (the num docs found value is set in ext/solr's SolrQueryWrapper?.java). Instead, for solr collections we for now don't report at term-level the total number of docs if there are multiple terms. The total number of docs returned is already being reported as the first line of the summary of results.

Location:
main/trunk/greenstone3/web
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/WEB-INF/classes/interface_default.properties

    r27081 r29275  
    6666query.docsreturned={0-numdocs} {1-level-plural} returned. 
    6767 
    68 query.termoccurs.1.1={0-term} occurs {1-termfreq} time in {2-numdocs} {3-level-single} 
    69 query.termoccurs.x.1={0-term} occurs {1-termfreq} times in {2-numdocs} {3-level-single} 
    70 query.termoccurs.x.x={0-term} occurs {1-termfreq} times in {2-numdocs} {3-level-plural} 
     68query.termoccurs.1.1={0-term} occurs {1-termfreq} time 
     69query.termoccurs.x.1={0-term} occurs {1-termfreq} times 
     70query.termoccurs.x.x={0-term} occurs {1-termfreq} times 
     71query.termSectionFreq=in {0-numdocs} {1-level-plural} 
    7172query.document=document 
    7273query.document_plural=documents 
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl

    r26883 r29275  
    335335                        </xsl:variable> 
    336336                        <span class="termInfo"> 
    337                             <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, $occursTextKey, concat(@name,';', @freq,';',  @numDocsMatch,';',  $levelText))"/> 
     337                          <!--<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, $occursTextKey, concat(@name,';', @freq,';',  @numDocsMatch,';',  $levelText))"/>--> 
     338                          <!-- For solr collections, display:  
     339                                 term x occured y times 
     340                                 term a occured b times 
     341                               For collections using all other indexers, display:  
     342                                 term x occurred y times in n sections/documents 
     343                                 term a occurred b times in m sections/docs 
     344                            --> 
     345                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, $occursTextKey, concat(@name,';', @freq))"/> 
     346                            <xsl:choose> 
     347                              <xsl:when test="/page/pageResponse/collection[@type != 'solr']"> 
     348                                <xsl:text> </xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termSectionFreq', concat(@numDocsMatch,';',  $levelText))"/> 
     349                              </xsl:when> 
     350                            </xsl:choose> 
    338351                        </span> 
    339352                        <br/>