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

Timestamp:

2018-09-13T10:46:14+12:00 (6 years ago)

Author:

kjdon

Message:

fixed a bug in a test path (missing first bracket), now test for root_hascover instead of hascover, which will work for sections as well as top level documents

File:

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

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

@@ -137 +137 @@
                 <xsl:when test="@type = 'screen'">Screen</xsl:when>
                 <xsl:when test="@type = 'source'">SourceFile</xsl:when>
-                <xsl:when test="@type = 'cover'">hascover</xsl:when>
+                <xsl:when test="@type = 'cover'">root_hascover</xsl:when>
             </xsl:choose>
         </xslt:variable>
@@ -154 +154 @@
             <xslt:otherwise>
               <xslt:choose>
-            <xslt:when test=".//metadataList)[last()]/metadata[@name='assocfilepath']">
+            <xslt:when test="(.//metadataList)[last()]/metadata[@name='assocfilepath']">
               <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='assocfilepath']" />
             </xslt:when>
@@ -170 +170 @@
                     <xsl:text>/index/assoc/</xsl:text><xslt:value-of disable-output-escaping="yes" select="$thisAssocfilepath" /><xsl:text>/</xsl:text>
                     <xslt:choose>
-                      <xslt:when test="$metaName = 'hascover'">cover.jpg</xslt:when>
+                      <xslt:when test="$metaName = 'root_hascover'">cover.jpg</xslt:when>
                       <xslt:otherwise>
                         <xslt:value-of disable-output-escaping="yes" select="./metadataList/metadata[@name = $metaName]"/>