254 to editionStatement; fix test.

Author: kefo

test/ConvSpec-250-270.xspec

@@ -15,9 +15,9 @@
     <x:expect label="250 creates an editionStatement property of the Instance" test="//bf:Instance[1]/bf:editionStatement = '3rd draft / edited by Paul Watson'"/>
   </x:scenario>
 
-  <x:scenario label="254 - MUSICAL PRESENTATION STATEMENT">
+  <x:scenario label="254 - MUSICAL EDITION STATEMENT">
     <x:context href="data/ConvSpec-250-270/marc.xml"/>
-    <x:expect label="254 creates a musicFormt/MusicFormat property of the Work" test="//bf:Work[1]/bf:musicFormat/bf:MusicFormat/rdfs:label = 'Full score'"/>
+    <x:expect label="254 creates a editionStatement property of the Instance" test="//bf:Instance[1]/bf:editionStatement = 'Full score'"/>
   </x:scenario>
 
   <x:scenario label="255 - CARTOGRAPHIC MATHEMATICAL DATA">

xsl/ConvSpec-250-270.xsl

@@ -11,23 +11,19 @@
 
   <!-- Conversion specs for 250-270 -->
 
-  <xsl:template match="marc:datafield[@tag='254' or (@tag='880' and substring(marc:subfield[@code='6'],1,3)='254')]" mode="work">
+  <xsl:template match="marc:datafield[@tag='254' or (@tag='880' and substring(marc:subfield[@code='6'],1,3)='254')]" mode="instance">
     <xsl:param name="serialization" select="'rdfxml'"/>
     <xsl:variable name="vXmlLang"><xsl:apply-templates select="." mode="xmllang"/></xsl:variable>
     <xsl:choose>
       <xsl:when test="$serialization = 'rdfxml'">
-        <bf:musicFormat>
-          <bf:MusicFormat>
-            <rdfs:label>
-              <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="marc:subfield[@code='a']"/>
-              </xsl:call-template>
-            </rdfs:label>
-          </bf:MusicFormat>
-        </bf:musicFormat>
+        <bf:editionStatement>
+          <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="marc:subfield[@code='a']"/>
+           </xsl:call-template>
+         </bf:editionStatement>
       </xsl:when>
     </xsl:choose>
   </xsl:template>