Changeset 26022 for main/trunk/greenstone3

Timestamp:

2012-07-25T16:43:31+12:00 (12 years ago)

Author:

sjm84

Message:

Some improvements to the gsf:image statement

File:

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

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

@@ -46 +46 @@
 
     <xsl:template match="gsf:image">
-        <xsl:variable name="metaName">
+        <xslt:variable name="metaName">
             <xsl:choose>
                 <xsl:when test="@type = 'thumb'">Thumb</xsl:when>
@@ -52 +52 @@
                 <xsl:when test="@type = 'source'">SourceFile</xsl:when>
             </xsl:choose>
-        </xsl:variable>
-        <xsl:if test="(.//metadataList)[last()]/metadata[@name = $metaName]">
+        </xslt:variable>
+        <xslt:if test="(.//metadataList)[last()]/metadata[@name = $metaName]">
             <img>
                 <xslt:attribute name='src'>
@@ -60 +60 @@
                     <xslt:value-of disable-output-escaping="yes" select="/page/pageResponse/document/metadataList/metadata[@name = 'assocfilepath']"/>
                     <xsl:text>/</xsl:text>
-                    <xsl:choose>
-                        <xsl:when test="@type = 'thumb'">
-                            <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name = 'Thumb']"/>
-                        </xsl:when>
-                        <xsl:when test="@type = 'screen'">
-                            <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name = 'Screen']"/>
-                        </xsl:when>
-                        <xsl:when test="@type = 'source'">
-                            <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name = 'SourceFile']"/>
-                        </xsl:when>
-                    </xsl:choose>
+                    <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name = $metaName]"/>
                 </xslt:attribute>
             </img>
-        </xsl:if>
+        </xslt:if>
     </xsl:template>