Output correct indicator value when it is 630 hub; allow names as paired 880s.

Author: kefo

rules/08-6XX.xml

@@ -76,7 +76,7 @@
           </switch>
         </var>
 
-        <!--
+
         <var name="v880Script">
           <switch>
             <case test="self::node()/*/rdfs:label/@xml:lang">
@@ -121,7 +121,6 @@
             </xsl:if>
           </transform>
         </var>
-        -->
 
         <var name="vShared0and1">
           <switch>
@@ -242,7 +241,7 @@
           </ind1>
           <ind2 default="4">
             <switch>
-              <case test="contains($relURI, '/subjects/') or contains($relURI, '/names/')">0</case>
+              <case test="contains($relURI, '/subjects/') or contains($relURI, '/names/') or contains($relURI, '/resources/hubs/')">0</case>
               <case test="contains($relURI, '/childrensSubjects/')">1</case>
               <case test="contains($relURI, '/mesh/')">2</case>
               <case test="contains($relURI, '/nalt/')">3</case>
@@ -268,12 +267,16 @@
               <case test="bf:source[@rdf:resource='http://id.loc.gov/vocabulary/subjectSchemes/rvm']">6</case>
             </switch>
           </ind2>
-          <!--<switch>
-            <case test="$vNameVariant//marc:record">
-              <!-\- We have a variant, so we need to create an 880 link. -\->
+          <switch>
+            <case test="(
+                          $vSubjectTag='600' or 
+                          $vSubjectTag='610' or 
+                          $vSubjectTag='611'
+                        ) and $vNameVariant//marc:record">
+              <!-- We have a variant, so we need to create an 880 link. -->
               <sf code="6"><transform><xsl:value-of select="concat('880-', $vOccurrenceNumber)"/></transform></sf>   
             </case>
-          </switch>-->
+          </switch>
           <transform>
             <xsl:for-each select="$vRelResource//marc:datafield[starts-with(@tag, '1')]/marc:subfield[contains($vValidSubfields,@code)]">
               <marc:subfield>
@@ -310,10 +313,13 @@
           </sf>
           <transform><xsl:copy-of select="$vShared0and1" /></transform>
         </df>
-        
-        <!-- 880
+
         <switch>
-          <case test="$vNameVariant//marc:record">
+          <case test="(
+                    $vSubjectTag='600' or 
+                    $vSubjectTag='610' or 
+                    $vSubjectTag='611'
+                  ) and $vNameVariant//marc:record">
             <df tag="880">
               <ind1 default=" ">
                 <switch>
@@ -330,7 +336,7 @@
               </ind1>
               <ind2 default="4">
                 <switch>
-                  <case test="contains($relURI, '/subjects/') or contains($relURI, '/names/')">0</case>
+                  <case test="contains($relURI, '/subjects/') or contains($relURI, '/names/') or contains($relURI, '/resources/hubs/')">0</case>
                   <case test="contains($relURI, '/childrensSubjects/')">1</case>
                   <case test="contains($relURI, '/mesh/')">2</case>
                   <case test="contains($relURI, '/nalt/')">3</case>
@@ -351,7 +357,7 @@
               </ind2>
               <switch>
                 <case test="$vNameVariant//marc:record">
-                  <!-\- We have a variant, so we need to create an 880 link. -\->
+                  <!-- We have a variant, so we need to create an 880 link. -->
                   <sf code="6"><transform><xsl:value-of select="concat($vSubjectTag, '-', $vOccurrenceNumber, '/', $v880Script)"/></transform></sf>   
                 </case>
               </switch>
@@ -381,7 +387,7 @@
               </transform>
               <sf code="2">
                 <switch>
-                  <!-\- <case test="contains($relURI, '/names/')">naf</case> -\->
+                  <!-- <case test="contains($relURI, '/names/')">naf</case> -->
                   <case test="contains($relURI, '/genreForms/')">lcgft</case>
                   <case test="contains($relURI, '/demogrpahicTerms/')">lcdgt</case>
                   <case test="contains($relURI, '/graphicMaterials/')">lctgm</case>
@@ -393,7 +399,7 @@
             </df>
           </case>
         </switch>
-        -->
+        
       </case>
       <case test="self::node()[
                     not(@rdf:resource) and