Changeset 36287 for main

Timestamp:

2022-07-04T16:32:02+12:00 (22 months ago)

Author:

anupama

Message:

PagedImg-e showed up a bug where only the first page of a paged-img document was shown with its img and text. Dr Bainbridge identified the bug as the self-closing div problem and suggested I look at gsf:div definition for solution (if I couldn't use gsf:div itself). Following his Kathy's advice to debug document.xsl by adding AAAA to ZZZZ to each template, I've now found the location(s) that resulted in the self-closing div. Using gsf:div in place of div sufficed to fix the problem.

Location:

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

Files:

• gslib.xsl (modified) (1 diff)
• pages/document.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

@@ -608 +608 @@
       The actual solution is here:
       https://stackoverflow.com/questions/19998180/xsl-copy-nodes-without-xmlns
-      - Close but adds namespacs to the first HTML tag:
+      - Close but adds namespaces to the first HTML tag:
       https://stackoverflow.com/questions/6199345/how-to-copy-all-child-nodes-of-any-type-of-a-template-context-element
       Other links that are a learning experience:

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

@@ -646 +646 @@
               </xsl:text>
             </script>
-                <div id="image{@nodeID}">
+                <gsf:div id="image{@nodeID}">
                   <!-- when we ask for an individual section content we set ed=1. putting this test here prevents downloading all the screen and full images for each section of the document when we are just looking at the contents list. ed is not set for simple docs, so do this if doctype is simple -->
                   <xsl:if test="/page/pageResponse/document[@docType='simple'] or /page/pageRequest/paramList/param[@name = 'ed']/@value='1'">
@@ -689 +689 @@
                     </script>
                 </xsl:if>
-                </div>
+                </gsf:div>
             </xsl:when>
             <xsl:otherwise>
-                <div id="image{@nodeID}">
+                <gsf:div id="image{@nodeID}">
                     <xsl:attribute name="style">
                         <xsl:choose>
@@ -704 +704 @@
                     </xsl:attribute>
                     <xsl:call-template name="sectionImage"/><xsl:text> </xsl:text>
-                </div>
+                </gsf:div>
             </xsl:otherwise>
         </xsl:choose>