From a42a5e22956485af1cf974a2de07344a3cd0fe5b Mon Sep 17 00:00:00 2001
From: Pierre Choffet <peuc@wanadoo.fr>
Date: Fri, 27 Mar 2026 15:48:44 -0400
Subject: [PATCH] Minor fixes in wdef generation process

---
 marc_banq2wdef.xslt | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/marc_banq2wdef.xslt b/marc_banq2wdef.xslt
index 489ee3d..9987977 100644
--- a/marc_banq2wdef.xslt
+++ b/marc_banq2wdef.xslt
@@ -378,7 +378,7 @@
 				<xsl:with-param name="record-id" select="$record-id" />
 			</xsl:call-template>
 			
-			<!-- Add P19 (lieu de mort) -->
+			<!-- Add P20 (lieu de mort) -->
 			<xsl:call-template name="generate-P20">
 				<xsl:with-param name="element-id" select="$element-id" />
 				<xsl:with-param name="record-id" select="$record-id" />
@@ -1747,18 +1747,20 @@
 			<xsl:for-each select="$strings-fix-doc">
 				<xsl:for-each select="key('fix-by-id', $record-id)">
 					<xsl:for-each select="fix[@type='subtitle']">
-						<wdef:value>
-							<xsl:variable name="value-id" select="concat($property-id, '-V', count(preceding-sibling::fix[type='title']) + 1)" />
-							<xsl:attribute name="wdef:id">
-								<xsl:value-of select="$value-id" />
-							</xsl:attribute>
-							<wdef:translation>
-								<xsl:attribute name="xml:lang">
-									<xsl:value-of select="@xml:lang" />
+						<xsl:if test=". != ''">
+							<wdef:value>
+								<xsl:variable name="value-id" select="concat($property-id, '-V', count(preceding-sibling::fix[type='title']) + 1)" />
+								<xsl:attribute name="wdef:id">
+									<xsl:value-of select="$value-id" />
 								</xsl:attribute>
-								<xsl:value-of select="." />
-							</wdef:translation>
-						</wdef:value>
+								<wdef:translation>
+									<xsl:attribute name="xml:lang">
+										<xsl:value-of select="@xml:lang" />
+									</xsl:attribute>
+									<xsl:value-of select="." />
+								</wdef:translation>
+							</wdef:value>
+						</xsl:if>
 					</xsl:for-each>
 				</xsl:for-each>
 			</xsl:for-each>
@@ -1822,7 +1824,7 @@
 			</xsl:variable>
 			
 			<xsl:choose>
-				<xsl:when test="$place-370a != ''">
+				<xsl:when test="$place-qid != ''">
 					<wdef:property>
 						<xsl:variable name="property-id">
 							<xsl:call-template name="get-property-id">
@@ -1848,7 +1850,7 @@
 					</wdef:property>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:message terminate="yes">
+					<xsl:message terminate="no">
 						<xsl:value-of select="$record-id" />
 						<xsl:text> : pas d’équivalent répertorié pour le lieu suivant : « </xsl:text>
 						<xsl:value-of select="$place-370a" />
@@ -1934,7 +1936,7 @@
 				</xsl:attribute>
 				
 				<xsl:for-each select="$occupations-qids">
-					<xsl:if test="generate-id($occupations-qids[@qid][1]) = generate-id($occupations-qids)">
+					<xsl:if test="@qid != '' and generate-id($occupations-qids[@qid][1]) = generate-id($occupations-qids)">
 						<wdef:value>
 							<xsl:variable name="value-id" select="concat($property-id, '-V', generate-id($occupations-qids))" />
 							<xsl:attribute name="wdef:id">
@@ -2336,7 +2338,7 @@
 		</xsl:variable>
 		
 		<xsl:variable name="normalized-date">
-			<xsl:value-of select="normalize-space($date-extracted)" />
+			<xsl:value-of select="translate(normalize-space($date-extracted), '#u|', '')" />
 		</xsl:variable>
 		
 		<!-- Sanity check - YYYY, YYYYMM or YYYYMMDD only -->
@@ -2354,7 +2356,7 @@
 				<xsl:value-of select="concat(substring($normalized-date, 1, 4), '-', substring($normalized-date, 5, 2), '-', substring($normalized-date, 7, 2))" />
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:message terminate="yes">
+				<xsl:message terminate="no">
 					<xsl:value-of select="$record-id" />
 					<xsl:text> : date de publication extraite invalide (</xsl:text>
 					<xsl:value-of select="$date-extracted" />
@@ -2386,7 +2388,7 @@
 		</xsl:variable>
 		
 		<xsl:variable name="normalized-date">
-			<xsl:value-of select="normalize-space($date-extracted)" />
+			<xsl:value-of select="translate(normalize-space($date-extracted), '#u|', '')" />
 		</xsl:variable>
 		
 		<!-- Sanity check - YYYY only -->
@@ -2398,7 +2400,7 @@
 				<xsl:value-of select="$normalized-date" />
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:message terminate="yes">
+				<xsl:message terminate="no">
 					<xsl:value-of select="$record-id" />
 					<xsl:text> : année de publication extraite invalide (</xsl:text>
 					<xsl:value-of select="$date-extracted" />
-- 
2.53.0