From 7ae2cf24053d2d8806d4ba712fd278cc6c44145e Mon Sep 17 00:00:00 2001
From: Pierre Choffet <peuc@wanadoo.fr>
Date: Fri, 27 Mar 2026 10:53:44 -0400
Subject: [PATCH] Improve conversion to wdef

---
 marc_banq2wdef.xslt | 126 ++++++++++++++++++++++++++++++++------------
 1 file changed, 93 insertions(+), 33 deletions(-)

diff --git a/marc_banq2wdef.xslt b/marc_banq2wdef.xslt
index 21c6f3e..489ee3d 100644
--- a/marc_banq2wdef.xslt
+++ b/marc_banq2wdef.xslt
@@ -337,7 +337,7 @@
 			<xsl:if test="substring($element-id, 1, 1) = '?'">
 				<!-- Add french label -->
 				<wdef:label>
-					<xsl:attribute name="interface-lang">fr</xsl:attribute>
+					<xsl:attribute name="wdef:interface-lang">fr</xsl:attribute>
 					<xsl:call-template name="get-person-name">
 						<xsl:with-param name="record-id" select="$record-id" />
 					</xsl:call-template>
@@ -345,9 +345,9 @@
 				
 				<!-- Add french description -->
 				<wdef:description>
-					<xsl:attribute name="interface-lang">fr</xsl:attribute>
+					<xsl:attribute name="wdef:interface-lang">fr</xsl:attribute>
 					<!-- TODO: Write better description -->
-					<xsl:text>artiste</xsl:text>
+					<xsl:text>artiste œuvrant dans le domaine de l’estampe</xsl:text>
 				</wdef:description>
 			
 				<!-- Add P31 (nature de l’élément) -->
@@ -564,7 +564,7 @@
 			</xsl:call-template>
 			
 			<!-- Add description -->
-			<wdef:description interface-lang="fr">
+			<wdef:description wdef:interface-lang="fr">
 				<xsl:text>édition d’un catalogue d’exposition</xsl:text>
 			</wdef:description>
 			
@@ -635,7 +635,7 @@
 			<xsl:for-each select="key('fix-by-id', $record-id)">
 				<xsl:for-each select="fix[@type='title']">
 					<wdef:label>
-						<xsl:attribute name="interface-lang">
+						<xsl:attribute name="wdef:interface-lang">
 							<xsl:value-of select="@xml:lang" />
 						</xsl:attribute>
 						<xsl:choose>
@@ -669,7 +669,7 @@
 		
 		<!-- TODO: Complete this -->
 		<wdef:description>
-			<xsl:attribute name="interface-lang">fr</xsl:attribute>
+			<xsl:attribute name="wdef:interface-lang">fr</xsl:attribute>
 			
 			<xsl:choose>
 				<xsl:when test="$work-type = 'print'">
@@ -843,9 +843,25 @@
 							<xsl:call-template name="check-person-to-publishing-date">
 								<xsl:with-param name="bibliographic-id" select="$record-id" />
 								<xsl:with-param name="creator-id" select="$creator-id" />
+								<xsl:with-param name="zone-id" select="'100'" />
 							</xsl:call-template>
 						</xsl:if>
 					</xsl:variable>
+					<xsl:variable name="creator-element-id">
+						<xsl:call-template name="get-element-id">
+							<xsl:with-param name="record-id" select="$creator-id" />
+							<xsl:with-param name="record-type" select="'authority'" />
+						</xsl:call-template>
+					</xsl:variable>
+					
+					<xsl:if test="(@tag = '110' or @tag = '111') and substring($creator-element-id, 1, 1) = '?'">
+						<xsl:message terminate="no">
+							<xsl:value-of name="element-id" select="$element-id" />
+							<xsl:text> : pas d’équivalent connu pour la personne morale « </xsl:text>
+							<xsl:value-of name="record-id" select="$creator-id" />
+							<xsl:text> »</xsl:text>
+						</xsl:message>
+					</xsl:if>
 					
 					<wdef:value>
 						<xsl:variable name="value-id" select="concat($property-id, '-V', generate-id(.))" />
@@ -853,10 +869,7 @@
 							<xsl:value-of select="$value-id" />
 						</xsl:attribute>
 						<wdef:ref-element>
-							<xsl:call-template name="get-element-id">
-								<xsl:with-param name="record-id" select="$creator-id" />
-								<xsl:with-param name="record-type" select="'authority'" />
-							</xsl:call-template>
+							<xsl:value-of select="$creator-element-id" />
 						</wdef:ref-element>
 					</wdef:value>
 				</xsl:for-each>
@@ -933,9 +946,25 @@
 							<xsl:call-template name="check-person-to-publishing-date">
 								<xsl:with-param name="bibliographic-id" select="$record-id" />
 								<xsl:with-param name="creator-id" select="$creator-id" />
+								<xsl:with-param name="zone-id" select="'100'" />
 							</xsl:call-template>
 						</xsl:if>
 					</xsl:variable>
+					<xsl:variable name="creator-element-id">
+						<xsl:call-template name="get-element-id">
+							<xsl:with-param name="record-id" select="$creator-id" />
+							<xsl:with-param name="record-type" select="'authority'" />
+						</xsl:call-template>
+					</xsl:variable>
+					
+					<xsl:if test="(@tag = '110' or @tag = '111') and substring($creator-element-id, 1, 1) = '?'">
+						<xsl:message terminate="no">
+							<xsl:value-of name="element-id" select="$element-id" />
+							<xsl:text> : pas d’équivalent connu pour la personne morale « </xsl:text>
+							<xsl:value-of name="record-id" select="$creator-id" />
+							<xsl:text> »</xsl:text>
+						</xsl:message>
+					</xsl:if>
 					
 					<wdef:value>
 						<xsl:variable name="value-id" select="concat($property-id, '-V', generate-id(.))" />
@@ -943,10 +972,7 @@
 							<xsl:value-of select="$value-id" />
 						</xsl:attribute>
 						<wdef:ref-element>
-							<xsl:call-template name="get-element-id">
-								<xsl:with-param name="record-id" select="$creator-id" />
-								<xsl:with-param name="record-type" select="'authority'" />
-							</xsl:call-template>
+							<xsl:value-of select="$creator-element-id" />
 						</wdef:ref-element>
 						
 						<!-- Build roles list -->
@@ -965,6 +991,7 @@
 									<xsl:attribute name="wdef:id">
 										<xsl:value-of select="$qualifier-property-id" />
 									</xsl:attribute>
+									<xsl:attribute name="wdef:pid">P2868</xsl:attribute>
 									<wdef:value>
 										<xsl:variable name="qualifier-value-id" select="concat($qualifier-property-id, '-V', generate-id(.))" />
 										<xsl:attribute name="wdef:id">
@@ -1053,9 +1080,25 @@
 							<xsl:call-template name="check-person-to-publishing-date">
 								<xsl:with-param name="bibliographic-id" select="$record-id" />
 								<xsl:with-param name="creator-id" select="$creator-id" />
+								<xsl:with-param name="zone-id" select="'100'" />
 							</xsl:call-template>
 						</xsl:if>
 					</xsl:variable>
+					<xsl:variable name="creator-element-id">
+						<xsl:call-template name="get-element-id">
+							<xsl:with-param name="record-id" select="$creator-id" />
+							<xsl:with-param name="record-type" select="'authority'" />
+						</xsl:call-template>
+					</xsl:variable>
+					
+					<xsl:if test="(@tag = '110' or @tag = '111') and substring($creator-element-id, 1, 1) = '?'">
+						<xsl:message terminate="no">
+							<xsl:value-of name="element-id" select="$element-id" />
+							<xsl:text> : pas d’équivalent connu pour la personne morale « </xsl:text>
+							<xsl:value-of name="record-id" select="$creator-id" />
+							<xsl:text> »</xsl:text>
+						</xsl:message>
+					</xsl:if>
 					
 					<wdef:value>
 						<xsl:variable name="value-id" select="concat($property-id, '-V', generate-id(.))" />
@@ -1063,10 +1106,7 @@
 							<xsl:value-of select="$value-id" />
 						</xsl:attribute>
 						<wdef:ref-element>
-							<xsl:call-template name="get-element-id">
-								<xsl:with-param name="record-id" select="$creator-id" />
-								<xsl:with-param name="record-type" select="'authority'" />
-							</xsl:call-template>
+							<xsl:value-of select="$creator-element-id" />
 						</wdef:ref-element>
 						
 						<!-- Build roles list -->
@@ -1085,6 +1125,7 @@
 									<xsl:attribute name="wdef:id">
 										<xsl:value-of select="$qualifier-property-id" />
 									</xsl:attribute>
+									<xsl:attribute name="wdef:pid">P2868</xsl:attribute>
 									<wdef:value>
 										<xsl:variable name="qualifier-value-id" select="concat($qualifier-property-id, '-V', generate-id(.))" />
 										<xsl:attribute name="wdef:id">
@@ -1258,9 +1299,25 @@
 							<xsl:call-template name="check-person-to-publishing-date">
 								<xsl:with-param name="bibliographic-id" select="$record-id" />
 								<xsl:with-param name="creator-id" select="$creator-id" />
+								<xsl:with-param name="zone-id" select="'700'" />
 							</xsl:call-template>
 						</xsl:if>
 					</xsl:variable>
+					<xsl:variable name="creator-element-id">
+						<xsl:call-template name="get-element-id">
+							<xsl:with-param name="record-id" select="$creator-id" />
+							<xsl:with-param name="record-type" select="'authority'" />
+						</xsl:call-template>
+					</xsl:variable>
+					
+					<xsl:if test="(@tag = '710' or @tag = '711') and substring($creator-element-id, 1, 1) = '?'">
+						<xsl:message terminate="no">
+							<xsl:value-of name="element-id" select="$element-id" />
+							<xsl:text> : pas d’équivalent connu pour la personne morale « </xsl:text>
+							<xsl:value-of name="record-id" select="$creator-id" />
+							<xsl:text> »</xsl:text>
+						</xsl:message>
+					</xsl:if>
 					
 					<wdef:value>
 						<xsl:variable name="value-id" select="concat($property-id, '-V', generate-id(.))" />
@@ -1268,10 +1325,7 @@
 							<xsl:value-of select="$value-id" />
 						</xsl:attribute>
 						<wdef:ref-element>
-							<xsl:call-template name="get-element-id">
-								<xsl:with-param name="record-id" select="$creator-id" />
-								<xsl:with-param name="record-type" select="'authority'" />
-							</xsl:call-template>
+							<xsl:value-of select="$creator-element-id" />
 						</wdef:ref-element>
 						
 						<!-- Build roles list -->
@@ -1290,6 +1344,7 @@
 									<xsl:attribute name="wdef:id">
 										<xsl:value-of select="$qualifier-property-id" />
 									</xsl:attribute>
+									<xsl:attribute name="wdef:pid">P2868</xsl:attribute>
 									<wdef:value>
 										<xsl:variable name="qualifier-value-id" select="concat($qualifier-property-id, '-V', generate-id(.))" />
 										<xsl:attribute name="wdef:id">
@@ -1330,7 +1385,7 @@
 				<xsl:attribute name="wdef:id">
 					<xsl:value-of select="$value-id" />
 				</xsl:attribute>
-				<wdef:ref-element>Q39628</wdef:ref-element>
+				<wdef:ref-element>Q138795882</wdef:ref-element>
 			</wdef:value>
 		</wdef:property>
 	</xsl:template>
@@ -1371,12 +1426,13 @@
 						<xsl:attribute name="wdef:id">
 							<xsl:value-of select="$qualifier-property-id" />
 						</xsl:attribute>
+						<xsl:attribute name="wdef:pid">P195</xsl:attribute>
 						<wdef:value>
 							<xsl:variable name="qualifier-value-id" select="concat($qualifier-property-id, '-V', generate-id(.))" />
 							<xsl:attribute name="wdef:id">
 								<xsl:value-of select="$qualifier-value-id" />
 							</xsl:attribute>
-							<wdef:ref-element>Q39628</wdef:ref-element>
+							<wdef:ref-element>Q138795882</wdef:ref-element>
 						</wdef:value>
 					</wdef:property>
 				</wdef:qualifier>
@@ -2119,7 +2175,7 @@
 		</wdef:property>
 	</xsl:template>
 	
-	<!-- Generate P6379 (identifiant BAnQ d’autorité) -->
+	<!-- Generate P6379 (collection comprenant une œuvre de la personne) -->
 	<xsl:template name="generate-P6379">
 		<xsl:param name="element-id" />
 		
@@ -2139,7 +2195,7 @@
 				<xsl:attribute name="wdef:id">
 					<xsl:value-of select="$value-id" />
 				</xsl:attribute>
-				<wdef:ref-element>Q39628</wdef:ref-element>
+				<wdef:ref-element>Q138795882</wdef:ref-element>
 			</wdef:value>
 		</wdef:property>
 	</xsl:template>
@@ -2147,7 +2203,7 @@
 	
 	<xsl:template name="generate-corporate-labels">
 		<wdef:label>
-			<xsl:attribute name="interface-lang">
+			<xsl:attribute name="wdef:interface-lang">
 				<xsl:value-of select="@xml:lang" />
 			</xsl:attribute>
 			<xsl:value-of select="marc:datafield[@tag='110']/marc:subfield[@code='a']" />
@@ -2157,7 +2213,7 @@
 	<xsl:template name="generate-corporate-description">
 		<!-- TODO: Complete this -->
 		<wdef:description>
-			<xsl:attribute name="interface-lang">
+			<xsl:attribute name="wdef:interface-lang">
 				<xsl:text>fr</xsl:text>
 			</xsl:attribute>
 			
@@ -2168,7 +2224,7 @@
 	
 	<xsl:template name="generate-meeting-labels">
 		<wdef:label>
-			<xsl:attribute name="interface-lang">
+			<xsl:attribute name="wdef:interface-lang">
 				<xsl:value-of select="@xml:lang" />
 			</xsl:attribute>
 			<xsl:value-of select="marc:datafield[@tag='111']/marc:subfield[@code='a']" />
@@ -2178,7 +2234,7 @@
 	<xsl:template name="generate-meeting-description">
 		<!-- TODO: Complete this -->
 		<wdef:description>
-			<xsl:attribute name="interface-lang">
+			<xsl:attribute name="wdef:interface-lang">
 				<xsl:text>fr</xsl:text>
 			</xsl:attribute>
 			
@@ -2471,6 +2527,7 @@
 	<xsl:template name="check-person-to-publishing-date">
 		<xsl:param name="bibliographic-id" />
 		<xsl:param name="creator-id" />
+		<xsl:param name="zone-id" />
 		
 		<xsl:variable name="bibliographic" select="key('bibliographic-from-001', $bibliographic-id)" />
 		<xsl:variable name="creator" select="key('person-authority-from-001', $creator-id)" />
@@ -2478,7 +2535,6 @@
 		<xsl:choose>
 			<xsl:when test="not($bibliographic)">
 				<xsl:message terminate="no">
-					<xsl:value-of select="$bibliographic-id" />
 					<xsl:text> : impossible de trouver la notice bibliographique </xsl:text>
 					<xsl:value-of select="$bibliographic-id" />
 				</xsl:message>
@@ -2515,7 +2571,9 @@
 					<xsl:when test="$birth-year != '' and (($publishing-year - $birth-year) &lt;= 15)">
 						<xsl:message terminate="no">
 							<xsl:value-of select="$bibliographic-id" />
-							<xsl:text> : le créateur </xsl:text>
+							<xsl:text> (zone </xsl:text>
+							<xsl:value-of select="$zone-id" />
+							<xsl:text>) : le créateur </xsl:text>
 							<xsl:value-of select="$creator-id" />
 							<xsl:text> (</xsl:text>
 							<xsl:value-of select="$birth-year" />
@@ -2531,7 +2589,9 @@
 					<xsl:when test="$death-date != '' and (($publishing-year - substring($death-date, 1, 4)) &gt; 2)">
 						<xsl:message terminate="no">
 							<xsl:value-of select="$bibliographic-id" />
-							<xsl:text> : le créateur </xsl:text>
+							<xsl:text> (zone </xsl:text>
+							<xsl:value-of select="$zone-id" />
+							<xsl:text>) : le créateur </xsl:text>
 							<xsl:value-of select="$creator-id" />
 							<xsl:text> (</xsl:text>
 							<xsl:value-of select="$birth-year" />
-- 
2.53.0