From b5c9d084db6de111b81eaf21580b6f27af4d3a24 Mon Sep 17 00:00:00 2001
From: tylerjmchugh <163562062+tylerjmchugh@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:16:37 -0400
Subject: [PATCH] Add missing foreach to keywords without thesaurus logic
 (#375)

---
 .../iso19139.ca.HNAP/layout/tpl-csv.xsl       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/plugin/iso19139.ca.HNAP/layout/tpl-csv.xsl b/src/main/plugin/iso19139.ca.HNAP/layout/tpl-csv.xsl
index 3601bbf6..dbf8e379 100644
--- a/src/main/plugin/iso19139.ca.HNAP/layout/tpl-csv.xsl
+++ b/src/main/plugin/iso19139.ca.HNAP/layout/tpl-csv.xsl
@@ -105,19 +105,23 @@
           </xsl:when>
           <!-- All keywords with a valid keywordTypeCode -->
           <xsl:when test="$keywordTypeCodeReadable != ''">
-            <xsl:element name="keyword-{$keywordTypeCodeReadable}">
-              <xsl:apply-templates mode="localised" select=".">
-                <xsl:with-param name="langId" select="$langId"/>
-              </xsl:apply-templates>
-            </xsl:element>
+            <xsl:for-each select="gmd:keyword[not(@gco:nilReason) or */text() != '']">
+              <xsl:element name="keyword-{$keywordTypeCodeReadable}">
+                <xsl:apply-templates mode="localised" select=".">
+                  <xsl:with-param name="langId" select="$langId"/>
+                </xsl:apply-templates>
+              </xsl:element>
+            </xsl:for-each>
           </xsl:when>
           <!-- All keywords without a valid thesaurusName or keywordTypeCode -->
           <xsl:otherwise>
-            <keyword-other>
-              <xsl:apply-templates mode="localised" select=".">
-                <xsl:with-param name="langId" select="$langId"/>
-              </xsl:apply-templates>
-            </keyword-other>
+            <xsl:for-each select="gmd:keyword[not(@gco:nilReason) or */text() != '']">
+              <keyword-other>
+                <xsl:apply-templates mode="localised" select=".">
+                  <xsl:with-param name="langId" select="$langId"/>
+                </xsl:apply-templates>
+              </keyword-other>
+            </xsl:for-each>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>