Ignore:
Timestamp:
2016-04-20T22:56:11+12:00 (8 years ago)
Author:
davidb
Message:

Changes in the XSL and JS code to support the new approach taken to client-side XSLT (using Saxon-CE JS library in the browser). Also the reintroduction of the DirectEdit (Seaweed) template. Not on by default but a simple matter to call the re-instated template for projects that would like to make use of it, such as the digital music stand DL collection. Some white-space changes also occured. This was not deliberate, but would have been quite fiddly to tease out from other changes in the file, so consequently left in.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r30311 r30478  
    236236                </xsl:when>
    237237                <xsl:when test="$numDocsMatched">
    238                     <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.manydocsmatch', concat($numDocsMatched, ';', $docLevelText))"/>
    239                     <xsl:if test="$numDocsReturned and not($numDocsMatched=$numDocsReturned)"> (<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.docsreturned', concat($numDocsReturned, ';', $docLevelText))"/>)</xsl:if>
     238                        <xsl:variable name="gitArgs1" select="concat($numDocsMatched, ';', $docLevelText)"/>
     239                        <xsl:variable name="gitArgs2" select="concat($numDocsReturned, ';', $docLevelText)"/>
     240                   
     241                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.manydocsmatch', $gitArgs1)"/>
     242                    <xsl:if test="$numDocsReturned and not($numDocsMatched=$numDocsReturned)"> (<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.docsreturned', $gitArgs2)"/>)</xsl:if>
    240243                </xsl:when>
    241244                <xsl:when test="$numDocsReturned">
    242                     <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.atleastdocsmatch', concat($numDocsReturned, ';', $docLevelText))"/>
     245                        <xsl:variable name="gitArgs" select="concat($numDocsReturned, ';', $docLevelText)"/>
     246                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.atleastdocsmatch', $gitArgs)"/>
    243247                </xsl:when>
    244248            </xsl:choose>
    … …  
    311315            <!-- If there is only one or two search terms then show the expanded information -->
    312316            <xsl:choose>
    313                 <xsl:when test="count(/page/pageResponse/termList/term) &lt; 3">
     317                          <xsl:when test="count(/page/pageResponse/termList/term) &lt; 3">
     318               
     319                        <xsl:variable name="qtOneToOne"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termoccurs.1.1')"/></xsl:variable>
     320                    <xsl:variable name="qtManyToOne"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termoccurs.x.1')"/></xsl:variable>
     321                    <xsl:variable name="qtManyToMany"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termoccurs.x.x')"/></xsl:variable>
     322
    314323                    <xsl:for-each select="/page/pageResponse/termList/term">
    315                         <xsl:variable name="occursTextKey">
     324
     325
     326                            <xsl:variable name="occursTextValue">
    316327                            <xsl:choose>
    317                                 <xsl:when test="@freq = 1">query.termoccurs.1.1</xsl:when>
    318                                 <xsl:when test="@numDocsMatch = 1">query.termoccurs.x.1</xsl:when>
    319                                 <xsl:otherwise>query.termoccurs.x.x</xsl:otherwise>
     328                                <xsl:when test="@freq = 1"><xsl:value-of select="$qtOneToOne"/></xsl:when>
     329                                <xsl:when test="@numDocsMatch = 1"><xsl:value-of select="$qtManyToOne"/></xsl:when>
     330                                <xsl:otherwise><xsl:value-of select="$qtManyToMany"/></xsl:otherwise>
    320331                            </xsl:choose>
    321332                        </xsl:variable>
    … …  
    327338                        </xsl:variable>
    328339                        <span class="termInfo">
    329                           <!--<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, $occursTextKey, concat(@name,';', @freq,';',  @numDocsMatch,';',  $levelText))"/>-->
    330340                          <!-- For solr collections, display:
    331341                                 term x occured y times
    … …  
    334344                                 term x occurred y times in n sections/documents
    335345                                 term a occurred b times in m sections/docs
    336                             -->
    337                             <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, $occursTextKey, concat(@name,';', @freq))"/>
     346                          -->
     347                          <xsl:variable name="gitArg1" select="concat(@name,';', @freq)"/>
     348
     349                            <xsl:choose>
     350                              <xsl:when test="@freq = 1">
     351                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termoccurs.1.1',$gitArg1)"/>
     352                              </xsl:when>
     353                              <xsl:when test="@numDocsMatch = 1">
     354                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termoccurs.x.1',$gitArg1)"/>
     355                              </xsl:when>
     356                              <xsl:otherwise>
     357                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termoccurs.x.x',$gitArg1)"/>
     358                              </xsl:otherwise>
     359                            </xsl:choose>
     360                           
     361                            <!--
     362                                <xsl:value-of select="java:org.greenstone.gsdl3.util.XSLTUtil.getInterfaceTextSubstituteArgs($gitArgXXX,$gitArg1)"/>
     363-->
     364                             
     365<!--                         
     366    <xsl:value-of select="java:org.greenstone.gsdl3.util.XSLTUtil.getInterfaceTextSubstituteArgs($occursTextValue,$gitArg1)"/>
     367    -->
     368                             
     369                         
    338370                            <xsl:choose>
    339371                              <xsl:when test="/page/pageResponse/collection[@type != 'solr']">
    340                                 <xsl:text> </xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termSectionFreq', concat(@numDocsMatch,';',  $levelText))"/>
     372                                <xsl:variable name="gitArg2" select="concat(@numDocsMatch,';',  $levelText)"/>
     373                                <xsl:text> </xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.termSectionFreq', $gitArg2)"/>
    341374                              </xsl:when>
    342375                            </xsl:choose>
    … …  
    466499                    </xsl:variable>
    467500                    <td id="searchResultsStatusBar">
    468                         <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.displayingnumdocs', concat($startdoc,';', $enddoc, ';', $docMax, ';', $levelString))"/>
     501                            <xsl:variable name="gitArgs" select="concat($startdoc,';', $enddoc, ';', $docMax, ';', $levelString)"/>
     502                        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.displayingnumdocs', $gitArgs)"/>
    469503                    </td>
    470504                </xsl:if>
Note: See TracChangeset for help on using the changeset viewer.