FIx applies to from 490; add tests.

lcnetdev · Aug 30, 2024 · db20f21 · db20f21
1 parent 7ad919a
commit db20f21
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 30 deletions.
diff --git a/test/ConvSpec-Process6-Series.xspec b/test/ConvSpec-Process6-Series.xspec
@@ -13,6 +13,15 @@
     <x:context href="data/ConvSpec-Process6-Series/marc.xml"/>
     <x:expect label="Parallel title created." test="//bf:Work[2]/bf:relation[1]/bf:Relation/bf:associatedResource/bf:Series/bf:title/bf:ParallelTitle/bf:mainTitle = 'Atti di conferenze'"/>
     <x:expect label="second hub if 490a[2]." test="//bf:Work[3]/bf:relation[2]/bf:Relation/bf:associatedResource/bf:Series/bf:title/bf:Title/bf:mainTitle = 'Department and Foreign Service series ;'"/>
+
+    <x:expect label="Series is uncontrolled." test="//bf:Work[4]/bf:relation[1]/bf:Relation/bf:associatedResource/bf:Series/rdf:type/@rdf:resource = 'http://id.loc.gov/ontologies/bflc/Uncontrolled'" />
+    <x:expect label="Series has status of transcribed." test="//bf:Work[4]/bf:relation[1]/bf:Relation/bf:associatedResource/bf:Series/bf:status/bf:Status/@rdf:about = 'http://id.loc.gov/vocabulary/mstatus/t'" />
+    <x:expect label="Series title matches expected" test="//bf:Work[4]/bf:relation[1]/bf:Relation/bf:associatedResource/bf:Series/bf:title/bf:Title/bf:mainTitle = 'Lund studies in geography,'"/>
+    <x:expect label="Applies to..." test="//bf:Work[4]/bf:relation[1]/bf:Relation/bflc:appliesTo/bflc:AppliesTo/rdfs:label = '1972/73-1975-76: '"/>
+
+    <x:expect label="Series is uncontrolled." test="//bf:Work[4]/bf:relation[2]/bf:Relation/bf:associatedResource/bf:Series/rdf:type/@rdf:resource = 'http://id.loc.gov/ontologies/bflc/Uncontrolled'" />
+    <x:expect label="Series has status of transcribed." test="//bf:Work[4]/bf:relation[2]/bf:Relation/bf:associatedResource/bf:Series/bf:status/bf:Status/@rdf:about = 'http://id.loc.gov/vocabulary/mstatus/t'" />
+    <x:expect label="second hub if 490a[2]." test="//bf:Work[4]/bf:relation[2]/bf:Relation/bf:associatedResource/bf:Series/bf:title/bf:Title/bf:mainTitle = 'Ser. B, Human geography,'"/>
     <!--<x:expect label="Each $a/$x/$v combination creates a seriesStatement property of the Work" test="count(//bf:Work[1]/bf:relation/bf:Relation/bf:associatedResource/bf:Hub) = 1"/>    
     <x:expect label="Single $x appended to both $a in parallel title series statements" test="//bf:Work[1]/bf:relation[1]/bf:Relation/bf:seriesStatement[3] = 'Papers and documents of the I.C.I. Series C, Bibliographies ; 1234-5678 ; no. 3'"/>
     <x:expect label="$x of a 490 with ind1=1 and no matching 8XX creates a hasSeries property of the Work" test="//bf:Work[1]/bf:relation[1]/bf:Relation/bf:associatedResource/bf:Hub/bf:Work/bf:identifiedBy/bf:Issn/rdf:value = '1400-1144'"/>-->

diff --git a/test/data/ConvSpec-Process6-Series/marc.xml b/test/data/ConvSpec-Process6-Series/marc.xml
@@ -54,6 +54,30 @@
     </datafield>
 
   </record>
+
+  <record>
+    <controlfield tag="001">7</controlfield>
+    <datafield tag="245" ind1="1" ind2="0">
+      <subfield code="a">Ole Lukøie /</subfield>
+      <subfield code="c">H.C. Andersen ; illustrationer af Otto Dickmeiss.</subfield>
+    </datafield>
+    <datafield tag="490" ind1="1" ind2=" ">
+      <subfield code="3">1972/73-1975-76: </subfield>
+      <subfield code="a">Lund studies in geography,</subfield>
+      <subfield code="x">1400-1144 ;</subfield>
+      <subfield code="v">101</subfield>
+      <subfield code="a">Ser. B, Human geography,</subfield>
+      <subfield code="x">0076-1478 ;</subfield>
+      <subfield code="v">48</subfield>
+    </datafield>
+    <datafield tag="490" ind1="0" ind2=" ">
+      <subfield code="a">Papers and documents of the I.C.I. Series C, Bibliographies ;</subfield>
+      <subfield code="v">no. 3 =</subfield>
+      <subfield code="a">Travaux et documents de l'I.C.I. Série C, Bibliographies ;</subfield>
+      <subfield code="x">1234-5678 ;</subfield>
+      <subfield code="v">no 3</subfield>
+    </datafield>   
+  </record>
 <!--  <record>
     <controlfield tag="001">2</controlfield>
     <datafield tag="490" ind1="1" ind2=" ">
@@ -135,27 +159,4 @@
       <subfield code="v">dai 34-hen, etc.</subfield>
     </datafield>
   </record>  
-    <record>
-      <controlfield tag="001">7</controlfield>
-      <datafield tag="245" ind1="1" ind2="0">
-        <subfield code="a">Ole Lukøie /</subfield>
-        <subfield code="c">H.C. Andersen ; illustrationer af Otto Dickmeiss.</subfield>
-      </datafield>
-      <datafield tag="490" ind1="1" ind2=" ">
-        <subfield code="3">1972/73-1975-76: </subfield>
-        <subfield code="a">Lund studies in geography,</subfield>
-        <subfield code="x">1400-1144 ;</subfield>
-        <subfield code="v">101</subfield>
-        <subfield code="a">Ser. B, Human geography,</subfield>
-        <subfield code="x">0076-1478 ;</subfield>
-        <subfield code="v">48</subfield>
-      </datafield>
-      <datafield tag="490" ind1="0" ind2=" ">
-        <subfield code="a">Papers and documents of the I.C.I. Series C, Bibliographies ;</subfield>
-        <subfield code="v">no. 3 =</subfield>
-        <subfield code="a">Travaux et documents de l'I.C.I. Série C, Bibliographies ;</subfield>
-        <subfield code="x">1234-5678 ;</subfield>
-        <subfield code="v">no 3</subfield>
-      </datafield>   
-   </record>
 -->  </collection>
diff --git a/xsl/ConvSpec-Process6-Series.xsl b/xsl/ConvSpec-Process6-Series.xsl
@@ -252,14 +252,16 @@
 
                         </xsl:if>
 
-                        <xsl:if test="$vAppliesTo != ''">
-                          <bflc:appliesTo>
-                            <bflc:AppliesTo>
-                              <xsl:value-of select="$vAppliesTo"/>
-                            </bflc:AppliesTo>
-                          </bflc:appliesTo>
-                        </xsl:if>
                       </bf:associatedResource>
+                      <xsl:if test="$vAppliesTo != ''">
+                        <bflc:appliesTo>
+                          <bflc:AppliesTo>
+                            <rdfs:label>
+                              <xsl:value-of select="$vAppliesTo"/>
+                            </rdfs:label>
+                          </bflc:AppliesTo>
+                        </bflc:appliesTo>
+                      </xsl:if>
                       <xsl:if test="$vEnumeration != ''">
                         <bf:seriesEnumeration>
                           <xsl:value-of select="$vEnumeration"/>