Changeset 38053 for main/trunk/greenstone3/web/interfaces/default

Timestamp:

2023-09-07T11:51:09+12:00 (9 months ago)

Author:

kjdon

Message:

we also need to check the interface highlightQueryTerms options when deciding whether to do highlighting or not

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• layouts/toc.xsl (modified) (1 diff)
• pages/document-shared.xsl (modified) (1 diff)

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

@@ -349 +349 @@
 
                 <!-- Highlight on/off button -->
-                <xsl:if test="util:contains(/page/pageRequest/paramList/param[@name = 'p.s']/@value, 'Query') and not(metadataList/metadata[@name='NoText']) and not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true')">
+                <xsl:if test="util:contains(/page/pageRequest/paramList/param[@name = 'p.s']/@value, 'Query') and not(metadataList/metadata[@name='NoText']) and not (/page/pageResponse/interfaceOptions/option[@name='highlightQueryTerms']/@value='false') and not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true')">
                     <li>
                         <xsl:attribute name="title">

main/trunk/greenstone3/web/interfaces/default/transform/pages/document-shared.xsl

@@ -27 +27 @@
         <xsl:variable name="annotation_class">
             <xsl:choose>
-                <xsl:when test="/page/pageRequest/paramList/param[@name = 'hl']/@value = 'off' or /page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true'">
+                <xsl:when test="/page/pageRequest/paramList/param[@name = 'hl']/@value = 'off' or /page/pageResponse/interfaceOptions/option[@name='highlightQueryTerms']/@value='false' or /page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true'">
                     noTermHighlight
                 </xsl:when>