Changeset 25177 for main/trunk/greenstone3/web/interfaces/oran/transform/config_format.xsl

Timestamp:

2012-03-02T12:54:33+13:00 (12 years ago)

Author:

sjm84

Message:

Some major upgrades to the document view

File:

• main/trunk/greenstone3/web/interfaces/oran/transform/config_format.xsl (modified) (6 diffs)

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

@@ -54 +54 @@
                 <xsl:choose>
                     <xsl:when test="@type = 'thumb'">
-                        <xslt:value-of disable-output-escaping="yes" select=".//metadataList/metadata[@name = '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/metadata[@name = '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/metadata[@name = 'SourceFile']"/>
+                        <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name = 'SourceFile']"/>
                     </xsl:when>
                 </xsl:choose>
@@ -92 +92 @@
                 <a><xslt:attribute name='href'><xslt:value-of 
                    disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of 
-                   disable-output-escaping="yes" select="metadataList/metadata[@name='assocfilepath']" />/<xslt:value-of 
-                   disable-output-escaping="yes" select="metadataList/metadata[@name='srclinkFile']" /></xslt:attribute>
+                   disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='assocfilepath']" />/<xslt:value-of 
+                   disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='srclinkFile']" /></xslt:attribute>
                   <xsl:apply-templates/>
                 </a>
@@ -179 +179 @@
                         <xsl:text>(</xsl:text>
                     </xsl:if>
-                    <xsl:text>.//metadataList/metadata[@name='</xsl:text>
+                    <xsl:text>(.//metadataList)[last()]/metadata[@name='</xsl:text>
                     <xsl:apply-templates select="." mode="get-metadata-name"/>
                     <xsl:text>']</xsl:text>
@@ -209 +209 @@
         <xslt:value-of disable-output-escaping="yes">
             <xsl:attribute name="select">
-                <xsl:text>.//metadataList/metadata[@name="</xsl:text>
+                <xsl:text>(.//metadataList)[last()]/metadata[@name="</xsl:text>
                 <xsl:choose>
                     <xsl:when test="@select='parent'">
@@ -242 +242 @@
             <xsl:for-each select="gsf:metadata">
                 <xslt:when>
-                    <xsl:attribute name="test">.//metadataList/metadata[@name='<xsl:apply-templates select="." mode="get-metadata-name"/>']</xsl:attribute>
+                    <xsl:attribute name="test">(.//metadataList)[last()]/metadata[@name='<xsl:apply-templates select="." mode="get-metadata-name"/>']</xsl:attribute>
                     <xsl:apply-templates select="."/>
                 </xslt:when>
@@ -254 +254 @@
     <xsl:template match="gsf:switch">
         <xsl:variable name="meta-name"><xsl:apply-templates select="gsf:metadata" mode="get-metadata-name"/></xsl:variable>
-        <xslt:variable name="meta"><xsl:choose><xsl:when test="@preprocess"><xslt:value-of select="util:{@preprocess}(.//metadataList/metadata[@name='{$meta-name}'])"/></xsl:when><xsl:otherwise><xslt:value-of select=".//metadataList/metadata[@name='{$meta-name}']"/></xsl:otherwise></xsl:choose></xslt:variable>
+        <xslt:variable name="meta"><xsl:choose><xsl:when test="@preprocess"><xslt:value-of select="util:{@preprocess}((.//metadataList)[last()]/metadata[@name='{$meta-name}'])"/></xsl:when><xsl:otherwise><xslt:value-of select="(.//metadataList)[last()]/metadata[@name='{$meta-name}']"/></xsl:otherwise></xsl:choose></xslt:variable>
         <xslt:choose>
             <xsl:for-each select="gsf:when">