Changeset 29245 for main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

Timestamp:

2014-08-29T18:18:02+12:00 (10 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed a bug that is apparent when doing the final step of the basic Scanned Image tutorial. The reference to the parent's metadata to obtain the parent's volume number and title failed. The metadata was being requested and was returned in the response from the GS3 server, but the returned metadata has parent_ prefixed to the metanames Volume and Title but the config_format.xsl wasn't prefixing the parent_ when trying to access the metadata from the xml. Dr Bainbridge's fixes this.

File:

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

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

@@ -451 +451 @@
         <xsl:if test="not(@hidden = 'true')">
             <!-- set hidden=true on a gsf:metadata so that it gets retrieved from the server but not displayed -->
-            <xsl:variable name="meta_test"><xsl:call-template name="getMetadataTest"/></xsl:variable>             
+            <xsl:variable name="meta_test"><xsl:call-template name="getMetadataTest"/></xsl:variable>
             <xsl:variable name="separator">
                 <xsl:choose>
@@ -552 +552 @@
   <!-- if we have metadata name="dc.Date,Date" will make a test like (@name = 'dc.Date' or @name = 'Date') -->
   <xsl:template name="getMetadataTest">
-    (<xsl:for-each select="xalan:tokenize(@name, ',')"><xsl:if test="position()!=1"> or </xsl:if>@name='<xsl:if test='@select'><xsl:value-of select='@select'/><xsl:text>_</xsl:text></xsl:if><xsl:value-of select="."/>'</xsl:for-each>)
+  <xsl:variable name="selectattr"><xsl:value-of select='@select'/></xsl:variable>
+    (<xsl:for-each select="xalan:tokenize(@name, ',')"><xsl:if test="position()!=1"> or </xsl:if>@name='<xsl:if test="$selectattr != ''"><xsl:value-of select="$selectattr"/><xsl:text>_</xsl:text></xsl:if><xsl:value-of select="."/>'</xsl:for-each>)
   </xsl:template>