Changeset 33649

Timestamp:

2019-11-12T12:04:46+13:00 (4 years ago)

Author:

kjdon

Message:

renamed config_format and text_fragment_format to better represent what they do

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• expand-gsf-pass1.xsl (moved) (moved from main/trunk/greenstone3/web/interfaces/default/transform/text_fragment_format.xsl )
• expand-gsf.xsl (moved) (moved from main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl ) (2 diffs)

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

@@ -14 +14 @@
     <xsl:param name="use_client_side_xslt"/>
     <xsl:param name="collName"/>
+    <xsl:param name="lang"/>
 
     <xsl:output method="xml"/>
@@ -522 +523 @@
     </xsl:template>
     <!-- With gsf:collectionText, a user can request a string from the collection's dictionary in the current lang -->
-    <xsl:template match="gsf:collectionText" name="gsf:collectionText">
+    <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>
+        </xsl:template>
+    <xsl:template match="gsf:collectionText" name="gsf:collectionText">
+        <xsl:copy-of select="util:getCollectionText($collName, $site_name, $lang, @name, @args)/node()"/>
+    </xsl:template>
+
 
     <!-- if this gsf:metadata is a child of a document node then we want to get the metadata for that node -->