Ammend 020 and 024 so that acquisitionTerms is part of Identifier resource; fix tests, kind of.

Author: kefo

test/ConvSpec-010-048.xspec

@@ -52,7 +52,7 @@
     <x:expect label="020 creates identifiedBy/Isbn properties of the Instance" test="count(//bf:Instance[1]/bf:identifiedBy/bf:Isbn) = 3"/>
     <x:expect label="$a is the rdf:value of the Isbn (without parenthetical qualifier)" test="//bf:Instance[1]/bf:identifiedBy[9]/bf:Isbn/rdf:value = '0877790086'"/>
     <x:expect label="$a can include qualifier in parentheses" test="//bf:Instance[1]/bf:identifiedBy[9]/bf:Isbn/bf:qualifier = 'pbk'"/>
-    <x:expect label="$c creates an acqusitionTerms property of the Instance" test="//bf:Instance[1]/bf:acquisitionTerms[1] = '$10.00'"/>
+    <x:expect label="$c creates an acqusitionTerms property of the Instance" test="//bf:Instance[1]/bf:identifiedBy[9]/bf:acquisitionTerms[1] = '$10.00'"/>
     <x:expect label="$q creates a qualifier property of the Isbn" test="//bf:Instance[1]/bf:identifiedBy[10]/bf:Isbn/bf:qualifier = 'black leather'"/>
     <x:expect label="$z creates a status/Status property of the Isbn" test="//bf:Instance[1]/bf:identifiedBy[11]/bf:Isbn/bf:status/bf:Status/@rdf:about = 'http://id.loc.gov/vocabulary/mstatus/cancinv'"/>
     <x:expect label="...with rdfs:label 'invalid'" test="//bf:Instance[1]/bf:identifiedBy[11]/bf:Isbn/bf:status/bf:Status/rdfs:label = 'invalid'"/>
@@ -90,7 +90,7 @@
     <x:expect label="$a creates an identifiedBy/Identifier property of the Instance" test="//bf:Instance[1]/bf:identifiedBy[12]/bf:Isrc/rdf:value = 'NLC018413261'"/>
     <x:expect label="...except if $2 = 'eidr', then it creates an identifiedBy property on the Work" test="//bf:Work[1]/bf:identifiedBy[6]/bf:Eidr/rdf:value = '10.5240/EA73-79D7-1B2B-B378-3A73-M'"/>
     <x:expect label="$a can include qualifier in parentheses" test="//bf:Instance[1]/bf:identifiedBy[18]/bf:Identifier/bf:qualifier = 'v. 1'"/>
-    <x:expect label="$c creates an acquisitionTerms property of the instance" test="//bf:Instance[1]/bf:acquisitionTerms[3] = 'EUR28.50'"/>
+    <x:expect label="$c creates an acquisitionTerms property of the instance" test="//bf:Instance[1]/bf:identifiedBy[18]/bf:acquisitionTerms[1] = 'EUR28.50'"/>
     <x:expect label="$d creates a note property of the Identifier" test="//bf:Instance[1]/bf:identifiedBy[15]/bf:Ean/bf:note/bf:Note/rdfs:label = '51000'"/>
     <x:expect label="$q creates a qualifier property of the Identifier" test="//bf:Instance[1]/bf:identifiedBy[14]/bf:Ismn/bf:qualifier[2] = 'sewn'"/>
     <x:expect label="$z creates a status/Status property of the Identifier with rdfs:label 'invalid'" test="//bf:Instance[1]/bf:identifiedBy[13]/bf:Upc/bf:status/bf:Status/rdfs:label = 'invalid'"/>

xsl/ConvSpec-010-048.xsl

@@ -1021,17 +1021,6 @@
         </xsl:apply-templates>
       </xsl:when>
       <xsl:when test="$vTag='020'">
-        <xsl:choose>
-          <xsl:when test="$serialization='rdfxml'">
-            <xsl:for-each select="marc:subfield[@code='c']">
-              <bf:acquisitionTerms>
-                <xsl:call-template name="tChopPunct">
-                  <xsl:with-param name="pString" select="."/>
-                </xsl:call-template>
-              </bf:acquisitionTerms>
-            </xsl:for-each>
-          </xsl:when>
-        </xsl:choose>
         <xsl:apply-templates select="." mode="instanceId">
           <xsl:with-param name="serialization" select="$serialization"/>
           <xsl:with-param name="pIdentifier">bf:Isbn</xsl:with-param>
@@ -1081,20 +1070,6 @@
             </xsl:choose>
           </xsl:if>
         </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="$serialization='rdfxml'">
-            <xsl:for-each select="marc:subfield[@code='c']">
-              <bf:acquisitionTerms>
-                <xsl:if test="$vXmlLang != ''">
-                  <xsl:attribute name="xml:lang"><xsl:value-of select="$vXmlLang"/></xsl:attribute>
-                </xsl:if>
-                <xsl:call-template name="tChopPunct">
-                  <xsl:with-param name="pString" select="."/>
-                </xsl:call-template>
-              </bf:acquisitionTerms>
-            </xsl:for-each>
-          </xsl:when>
-        </xsl:choose>
         <xsl:if test="$vIdentifier != ''">
           <xsl:apply-templates select="." mode="instanceId">
             <xsl:with-param name="serialization" select="$serialization"/>
@@ -1274,8 +1249,8 @@
                   </bf:assigner>
                 </xsl:for-each>
               </xsl:if>
-              <!-- special handling for 036 -->
-              <xsl:if test="$vTag='036'">
+              <!-- special handling for 020, 024, 036 -->
+              <xsl:if test="$vTag='020' or $vTag='024' or $vTag='036'">
                 <xsl:for-each select="../marc:subfield[@code='c']">
                   <bf:acquisitionTerms>
                     <xsl:if test="$vXmlLang != ''">