Changeset 31533 for main/trunk/greenstone3/web/interfaces

Timestamp:

2017-03-23T12:12:59+13:00 (7 years ago)

Author:

kjdon

Message:

if ed=1 for paged document, want to go through the nodes and process them.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl (modified) (3 diffs)

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

@@ -219 +219 @@
                 </table>
             </xsl:if>
-            
             <xsl:choose>
                 <xsl:when test="../../document">
@@ -228 +227 @@
                 </xsl:otherwise>
             </xsl:choose>
-            
             <xsl:if test="documentNode">
                 <xsl:for-each select="documentNode">
@@ -383 +381 @@
                 OR If the docType is hierarchy and we have asked for the expanded document OR we have asked for the top level document then do this 
             -->
-            <xsl:when test="/page/pageResponse/document/@docType = 'hierarchy' and (/page/pageRequest/paramList/param[@name = 'alb']/@value = '1' or (string-length(/page/pageRequest/paramList/param[@name = 'd']/@value) > 0 and (/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or not(util:contains(/page/pageResponse/document/@selectedNode, '.')))))">
+            <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or (/page/pageResponse/document/@docType = 'hierarchy' and (/page/pageRequest/paramList/param[@name = 'alb']/@value = '1' or (string-length(/page/pageRequest/paramList/param[@name = 'd']/@value) > 0 and (/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or not(util:contains(/page/pageResponse/document/@selectedNode, '.'))))))">
                 <div id="gs-document">
                     <xsl:call-template name="documentPre"/>