Changeset 38825 for main/trunk

Timestamp:

2024-03-11T11:15:43+13:00 (3 months ago)

Author:

kjdon

Message:

mods to gsf:getCollectionText to allow propertyFile attribute if it doens't have the default name (currently interface_custom). ALso deleted getCOllectionText1 - this doesn't work, probably committed by mistake, a leftover form testing new version???

File:

• main/trunk/greenstone3/web/interfaces/default/transform/expand-gsf.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/transform/expand-gsf.xsl

@@ -533 +533 @@
     
     <!-- With gsf:collectionText, a user can request a string from the collection's dictionary in the current lang -->
-    <xsl:template match="gsf:collectionText1" name="gsf:collectionText1">
-        <xslt:variable name="collName" select="/page/pageResponse/collection/@name"/>
-        <xslt:copy-of select="util:getCollectionText($collName, $site_name, /page/@lang, '{@name}', '{@args}')/node()"/>
-        </xsl:template>
+    <!-- the default dictionary is interface_custom. To change the dictionary, use @propertyFile arg -->
     <xsl:template match="gsf:collectionText" name="gsf:collectionText">
-        <xsl:copy-of select="util:getCollectionText($collName, $site_name, $lang, @name, @args)/node()"/>
-    </xsl:template>
-
+      <xsl:choose>
+            <xsl:when test="@propertyFile">
+          <xsl:copy-of select="util:getCollectionText($collName, $site_name, @propertyFile, $lang, @name, @args)/node()"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="util:getCollectionText($collName, $site_name, $lang, @name, @args)/node()"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:template>
 
     <!-- if this gsf:metadata is a child of a document node then we want to get the metadata for that node -->