From 37954ce6630671e8ac8997c6aed3173ee5ffe1be Mon Sep 17 00:00:00 2001
From: Kevin Ford <kevinford@loc.gov>
Date: Fri, 30 Aug 2024 15:33:22 -0400
Subject: [PATCH] Handle dollar3 and dollar6 when parsing subfields for PA
 groups.

---
 xsl/ConvSpec-Process8-ProvAct.xsl | 120 ++++++++++++++++++++----------
 1 file changed, 80 insertions(+), 40 deletions(-)

diff --git a/xsl/ConvSpec-Process8-ProvAct.xsl b/xsl/ConvSpec-Process8-ProvAct.xsl
index fb4d319d..a5b1fce3 100644
--- a/xsl/ConvSpec-Process8-ProvAct.xsl
+++ b/xsl/ConvSpec-Process8-ProvAct.xsl
@@ -81,7 +81,7 @@
                     <xsl:with-param name="v880Ref" select="$v880Ref"/>
                 </xsl:call-template>
             </xsl:for-each>
-            
+
             <xsl:for-each select="$v880Fields">
                 <xsl:variable name="vTag">
                     <xsl:value-of select="substring(marc:subfield[@code = '6'], 1, 3)"/>
@@ -93,9 +93,14 @@
                 <xsl:variable name="v880Ref">
                     <xsl:value-of select="concat('880-', $v880Occurrence)"/>
                 </xsl:variable>
-                <xsl:variable name="relatedField" select="../marc:datafield[@tag = $vTag and contains(marc:subfield[@code = '6'], $v880Ref)]"
-                    />
-                <xsl:copy-of select="$relatedField"/>
+                
+                <!-- Is this 880 related to a 26X field in this record? -->
+                <xsl:variable name="relatedField" select="../marc:datafield[@tag = $vTag and contains(marc:subfield[@code = '6'], $v880Ref)]" />
+                
+                <!-- commented out on 30 Aug 2024.  Did doing this break something? -->
+                <!-- <xsl:copy-of select="$relatedField"/> -->
+                
+                <!-- If no related field was found, then we have an unpaied 880. We need to output it. -->
                 <xsl:if test="count($relatedField/marc:*) = 0">
                     <xsl:variable name="dfFrom880-prenodeset">
                         <marc:datafield>
@@ -121,7 +126,7 @@
             </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="sfblocks" select="exsl:node-set($sfblocks-prenodeset)"/>
-        <!--<xsl:copy-of select="$sfblocks"/>-->
+        <!-- <xsl:message><xsl:copy-of select="$sfblocks"/></xsl:message> -->
         
         <xsl:for-each select="$sfblocks/marc:sfGroup">
             <xsl:variable name="sfgTag" select="@tag"/>
@@ -249,11 +254,22 @@
                                         </bf:status>
                                     </xsl:if>
                                     
-                                    <xsl:apply-templates
-                                        select="$df/marc:sf[@code = '3'] | marc:df[@tag = '880']/marc:sf[@code = '3']"
-                                        mode="subfield3">
-                                        <xsl:with-param name="serialization" select="$serialization"/>
-                                    </xsl:apply-templates>
+                                    <xsl:choose>
+                                        <xsl:when test="$df/marc:sf[@code = '3']">
+                                            <xsl:apply-templates
+                                                select="$df/marc:sf[@code = '3'][1]"
+                                                mode="subfield3">
+                                                <xsl:with-param name="serialization" select="$serialization"/>
+                                            </xsl:apply-templates>
+                                        </xsl:when>
+                                        <xsl:when test="marc:df[@tag = '880']/marc:sf[@code = '3']">
+                                            <xsl:apply-templates
+                                                select="marc:df[@tag = '880']/marc:sf[@code = '3'][1]"
+                                                mode="subfield3">
+                                                <xsl:with-param name="serialization" select="$serialization"/>
+                                            </xsl:apply-templates>
+                                        </xsl:when>
+                                    </xsl:choose>
                                     <xsl:for-each select="$df/marc:sf[@code = 'a']">
                                         <xsl:variable name="sfPos" select="@pos"/>
                                         <xsl:variable name="vLabel">
@@ -485,6 +501,7 @@
             </xsl:call-template>
         </xsl:variable>
         <xsl:variable name="parsedSfs" select="exsl:node-set($parsedSfs-prenodeset)"/>
+        <!-- <xsl:message><xsl:copy-of select="$parsedSfs"/></xsl:message> -->
 
         <!-- Find the group numbers. -->
         <xsl:variable name="groups-prenodeset">
@@ -588,6 +605,18 @@
         <xsl:variable name="sf" select="$df/marc:subfield[$pos]"/>
         
         <xsl:choose>
+            <xsl:when test="$sf/@code = '3' or $sf/@code = '6'">
+                <marc:sf>
+                    <xsl:copy-of select="$sf/@*"/>
+                    <xsl:attribute name="gpos">
+                        <xsl:value-of select="$gpos"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="pos">
+                        <xsl:value-of select="$pos"/>
+                    </xsl:attribute>
+                    <xsl:copy-of select="$sf/text()"/>
+                </marc:sf>
+            </xsl:when>
             <xsl:when test="$df/@tag = '261' and ($sf/@code = 'a' or $sf/@code = 'b')">
                 <xsl:variable name="map260sfs">
                     <m sfCode="a">b</m>
@@ -656,36 +685,36 @@
                 </marc:sf>
             </xsl:when>
             <xsl:when test="$sf/@code = 'a' or $sf/@code = 'b' or $sf/@code = 'c'">
-            <marc:sf>
-                <xsl:copy-of select="$sf/@*"/>
-                <xsl:attribute name="gpos">
-                    <xsl:value-of select="$gpos"/>
-                </xsl:attribute>
-                <xsl:attribute name="pos">
-                    <xsl:value-of select="$pos"/>
-                </xsl:attribute>
-                <xsl:copy-of select="$sf/text()"/>
-            </marc:sf>
-        </xsl:when>
-        <xsl:when test="$sf/@code = 'e' or $sf/@code = 'f' or $sf/@code = 'g'">
-            <xsl:variable name="map260sfs">
-                <m sfCode="e">a</m>
-                <m sfCode="f">b</m>
-                <m sfCode="g">c</m>
-            </xsl:variable>
-            <marc:sf type="Manufacture">
-                <xsl:attribute name="code">
-                    <xsl:value-of select="exsl:node-set($map260sfs)/m[@sfCode = $sf/@code]"/>
-                </xsl:attribute>
-                <xsl:attribute name="gpos">
-                    <xsl:value-of select="$gpos"/>
-                </xsl:attribute>
-                <xsl:attribute name="pos">
-                    <xsl:value-of select="$pos"/>
-                </xsl:attribute>
-                <xsl:copy-of select="$sf/text()"/>
-            </marc:sf>
-        </xsl:when>
+                <marc:sf>
+                    <xsl:copy-of select="$sf/@*"/>
+                    <xsl:attribute name="gpos">
+                        <xsl:value-of select="$gpos"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="pos">
+                        <xsl:value-of select="$pos"/>
+                    </xsl:attribute>
+                    <xsl:copy-of select="$sf/text()"/>
+                </marc:sf>
+            </xsl:when>
+            <xsl:when test="$sf/@code = 'e' or $sf/@code = 'f' or $sf/@code = 'g'">
+                <xsl:variable name="map260sfs">
+                    <m sfCode="e">a</m>
+                    <m sfCode="f">b</m>
+                    <m sfCode="g">c</m>
+                </xsl:variable>
+                <marc:sf type="Manufacture">
+                    <xsl:attribute name="code">
+                        <xsl:value-of select="exsl:node-set($map260sfs)/m[@sfCode = $sf/@code]"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="gpos">
+                        <xsl:value-of select="$gpos"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="pos">
+                        <xsl:value-of select="$pos"/>
+                    </xsl:attribute>
+                    <xsl:copy-of select="$sf/text()"/>
+                </marc:sf>
+            </xsl:when>
         </xsl:choose>
 
         <xsl:variable name="next_gpos" select="$gpos + 1"/>
@@ -700,6 +729,17 @@
                     <xsl:with-param name="pos" select="$next_pos"/>
                 </xsl:call-template>
             </xsl:when>
+            <xsl:when
+                test="
+                ($sf/@code = '6' and $df/marc:subfield[$next_pos][@code = '3' or @code = 'a'])
+                or
+                ($sf/@code = '3' and $df/marc:subfield[$next_pos][@code = 'a'])">
+                <xsl:call-template name="parse26x">
+                    <xsl:with-param name="df" select="$df"/>
+                    <xsl:with-param name="gpos" select="$gpos"/>
+                    <xsl:with-param name="pos" select="$next_pos"/>
+                </xsl:call-template>
+            </xsl:when>
             <xsl:when
                 test="
                     ($sf/@code = 'a' and $df/marc:subfield[$next_pos][@code = 'a'])