Changeset 36907

Timestamp:

2022-11-15T14:00:33+13:00 (17 months ago)

Author:

kjdon

Message:

move the tkMetadataURL variable definition into a more appropriate template - prev, if a page didn't show teh quick search area (eg whakatohea), then you didn't get the metadata set loaded for TK labels

File:

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

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -720 +720 @@
        no search indexes, which is why the extra test for the presence of an index/fq-something is necessary. -->
   <xsl:template name="quick-search-area">
-
-    <gsf:variable name="tkMetadataURL_collection"><xsl:value-of select="$library_name"/>/sites/<xsl:value-of select="$site_name"/>/collect/<xsl:value-of select="$collNameChecked"/>/metadata/tk.mds</gsf:variable>
-    <gsf:variable name="tkMetadataURL_site"><xsl:value-of select="$library_name"/>/sites/<xsl:value-of select="$site_name"/>/metadata/tk.mds</gsf:variable>
-
     <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']">
       <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/>
@@ -865 +861 @@
 
   <xsl:template name="js-for-loading-tk-metadata-set">
+    <!-- gsf:variable sets these as xsl variables and also gs.variable["xx"] javascript variables-->
+    <gsf:variable name="tkMetadataURL_collection"><xsl:value-of select="$library_name"/>/sites/<xsl:value-of select="$site_name"/>/collect/<xsl:value-of select="$collNameChecked"/>/metadata/tk.mds</gsf:variable>
+    <gsf:variable name="tkMetadataURL_site"><xsl:value-of select="$library_name"/>/sites/<xsl:value-of select="$site_name"/>/metadata/tk.mds</gsf:variable>
+
     <script type="text/javascript">
       <xsl:text disable-output-escaping="yes">