Changeset 29093 for main

Timestamp:

2014-06-09T14:37:59+12:00 (10 years ago)

Author:

kjdon

Message:

allow comma separated metadata names in gsf:metadata name attribute. Then we can do something like <gsf:metadata name='dc.Date,Date' pos='classifiedBy'/> to output the value is a classifier list that the current document was classified By

File:

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

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

@@ -5 +5 @@
     xmlns:java="http://xml.apache.org/xslt/java"
     xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
+    xmlns:xalan="http://xml.apache.org/xalan"
     xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-    extension-element-prefixes="java">
+    extension-element-prefixes="java xalan">
     <xsl:param name="interface_name"/>
     <xsl:param name="library_name"/>
@@ -441 +442 @@
         <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_name">
-                <xsl:call-template name="getMetadataName"/>
-            </xsl:variable>
+            <xsl:variable name="meta_test"><xsl:call-template name="getMetadataTest"/></xsl:variable>             
             <xsl:variable name="separator">
                 <xsl:choose>
@@ -495 +494 @@
             <xslt:for-each>
                 <xsl:attribute name="select">
-                    (<xsl:if test="@type='collection'">/page/pageResponse/collection/</xsl:if>.//metadataList)[last()]/metadata[@name='<xsl:value-of select="$meta_name"/>'<xsl:if test="@lang">
+                  (<xsl:if test="@type='collection'">/page/pageResponse/collection/</xsl:if>.//metadataList)[last()]/metadata[<xsl:value-of select="$meta_test"/><xsl:if test="@lang">
                         <xsl:text> and @lang=</xsl:text>
                         <xsl:value-of select="@lang"/>
@@ -542 +541 @@
   </xsl:template>
 
+  <!-- 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:template>
 
     <xsl:template match="gsf:text">