Merge pull request #244 from lcnetdev/v2.6-dev

V2.6 dev

.circleci/config.yml

@@ -9,7 +9,7 @@ workflows:
 jobs:
   build:
     docker:
-      - image: circleci/buildpack-deps:scm
+      - image: cimg/openjdk:17.0
         auth:
           username: $DH_USERNAME
           password: $DH_PASSWORD
@@ -18,7 +18,27 @@ jobs:
       - run:
           name: Install testing prerequisites
           command: |
-            sudo apt-get update && sudo apt-get install -y openjdk-11-jre-headless libsaxonhe-java
+            # sudo apt-get update
+            # sudo apt-get install -y xsltproc
+            mkdir /tmp/saxon/
+            mkdir /tmp/saxon/lib/
+            
+            cd /tmp/saxon/
+            curl -o Saxon-HE.zip -L https://github.com/Saxonica/Saxon-HE/releases/download/SaxonHE12-4/SaxonHE12-4J.zip
+            unzip Saxon-HE.zip
+
+            # These files did not work despite some effort.
+            #curl -o /tmp/saxon/lib/xmlresolver-5.2.2.jar https://repo1.maven.org/maven2/org/xmlresolver/xmlresolver/5.2.2/xmlresolver-5.2.2.jar
+            #curl -o /tmp/saxon/lib/xmlresolver-5.2.2-data.jar https://repo1.maven.org/maven2/org/xmlresolver/xmlresolver/5.2.2/xmlresolver-5.2.2-data.jar  
+            #curl -o /tmp/saxon/lib/jline-2.14.6.jar https://repo1.maven.org/maven2/jline/jline/2.14.6/jline-2.14.6.jar
+            #curl -o /tmp/saxon/saxon-He-xx.x.jar https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}.jar 
+            #curl -o /tmp/saxon/saxon-He-xx.x-xqj.jar https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}-xqj.jar 
+            #curl -o /tmp/saxon/saxon-He-xx.x-test.jar https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}-test.jar 
+            
+            #cd /tmp/saxon/
+            #ls -l
+            #ls -l lib/*
+            
             git clone https://github.com/xspec/xspec.git /tmp/xspec
       - run:
           name: Run standard XSpec test suite

IDMETA

@@ -1,3 +1,3 @@
 NAME=marc2bibframe2
 CENTOS_DIST="centos7 centos8"
-VERSION=2.5.0
+VERSION=2.6.0

NEWS

@@ -1,3 +1,20 @@
+--- 2.6.0 2024/06/18
+Changes towards updated v2.6.0 specifications:
+    ConvSpec 3XX
+        MARC field 350 (Price) no longer converted
+    ConvSpec 010-048
+        "Placeholder" national bibliography numbers in MARC 015 (e.g. "GB***") no longer converted
+        National bibliographic agency control numbers (MARC 016 field) placed in Instance instead of Admin Metadata
+        MARC 015 fields without $2 no longer converted
+        The bf:acquisitionTerms literal created from MARC 020 and 024 $c (Terms of availability) is now placed within the bf:identifiedBy resource
+    ConvSpec 050-088
+        Government document numbers in MARC 086 placed in Work instead of Instance
+    ConvSpec 250-270
+        Musical presentation statement in MARC 254 now assigned to bf:editionStatement
+        New conversion of $1 in authorized access points and updated Numeric Subfields conversion document
+        Revised creation of Admin Metadata and the new Process 9 conversion specification outlines the changes
+
+
 --- 2.5.0 2024/01/19
 Changes towards updated v2.5.0 specifications:
 	ConvSpec 001-007

marc2bibframe2.spec

@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %docdir %{_docdir}/marc2bibframe2
 
 %changelog
+* Tues Jun 18 2024  Kevin Ford <kevinford@loc.gov> - 2.6.0-1.indexdata
+- Release 2.6.0
+
 * Fri Jan 19 2024  Kevin Ford <kevinford@loc.gov> - 2.5.0-1.indexdata
 - Release 2.5.0
 

release-notes.md

@@ -1,5 +1,19 @@
 # marc2bibframe2 release notes
 
+
+## v2.6.0
+
+Conversion updates based on specifications v2.6. See the Library of Congress’s [BIBFRAME site](https://www.loc.gov/bibframe/) for more details. Specifications are included in the distribution in the [spec](spec/) directory. Changes of note:
+
+* New conversion of $1 in authorized access points
+* Revised creation of Admin Metadata to create four distinct resources
+* More selective conversion of MARC 015 field to exclude placeholder numbers (e.g. "GB***") and numbers without source fields
+* Better handling of bf:acquisitionTerms literals from MARC 020/024 $c
+
+
+See the [NEWS](NEWS) file and the [updated specifications](spec/) for full details of changes. Changes from v2.4.0 in the specifications are marked in red.
+
+
 ## v2.5.0
 
 Conversion updates based on specifications v2.5. See the Library of Congress’s [BIBFRAME site](https://www.loc.gov/bibframe/) for more details. Specifications are included in the distribution in the [spec](spec/) directory. Changes of note:

test/ConvSpec-001-007.xspec

@@ -26,10 +26,12 @@
     <x:expect label="...and set the code for DLC" test="//bf:Work[4]/bf:adminMetadata/bf:AdminMetadata/bf:identifiedBy/bf:Local/bf:assigner/bf:Agent/bf:code = 'DLC'"/>
   </x:scenario>
 
-  <x:scenario label="005 - DATE AND TIME OF LAST TRANSACTION">
+  <x:scenario label="005 - DATE AND TIME OF LAST CATALOGER EDIT">
     <x:context href="data/ConvSpec-001-007/marc.xml"/>
-    <x:expect label="005 should set the AdminMetadata changeDate property for the work" test="//bf:Work[1]/bf:adminMetadata/bf:AdminMetadata/bf:changeDate[@rdf:datatype='http://www.w3.org/2001/XMLSchema#dateTime']  = '2011-07-13T21:24:05'"/>
-    <x:expect label="005 with all '0' should not convert" test="count(//bf:Work[1]/bf:adminMetadata/bf:AdminMetadata/bf:changeDate) = 1"/>
+    <x:expect label="005 should set the AdminMetadata status property to 'changed' for the work" test="//bf:Work[1]/bf:adminMetadata[2]/bf:AdminMetadata/bf:status/bf:Status/@rdf:about = 'http://id.loc.gov/vocabulary/mstatus/c'"/>
+    <x:expect label="005 AdminMetadata should not have generationProcess" test="not(//bf:Work[1]/bf:adminMetadata[2]/bf:AdminMetadata/bf:generationProcess)"/>
+    <x:expect label="005 should set the AdminMetadata changeDate property for the work" test="//bf:Work[1]/bf:adminMetadata[2]/bf:AdminMetadata/bf:date[@rdf:datatype='http://www.w3.org/2001/XMLSchema#dateTime']  = '2011-07-13T21:24:05'"/>
+    <x:expect label="005 with all '0' should not convert" test="count(//bf:Work[1]/bf:adminMetadata[2]/bf:AdminMetadata/bf:date) = 1"/>
   </x:scenario>
 
   <x:scenario label="007 - PHYSICAL DESCRIPTION FIXED FIELD">

test/ConvSpec-006,008.xspec

@@ -27,7 +27,8 @@
 
     <x:scenario label="ALL MATERIALS">
       <x:context href="data/ConvSpec-006,008/marc.xml"/>
-      <x:expect label="pos 0-5 should set the AdminMetadata creationDate property of the Work" test="//bf:Work[1]/bf:adminMetadata/bf:AdminMetadata/bf:creationDate = '2004-05-20'"/>
+      <x:expect label="pos 0-5 should set the AdminMetadata to type 'create'" test="//bf:Work[1]/bf:adminMetadata[1]/bf:AdminMetadata/bf:status/bf:Status/@rdf:about = 'http://id.loc.gov/vocabulary/mstatus/n'"/>
+      <x:expect label="pos 0-5 should set the AdminMetadata date property of the 'create' AM" test="//bf:Work[1]/bf:adminMetadata[1]/bf:AdminMetadata/bf:date = '2004-05-20'"/>
       <x:expect label="pos 6-14 date handling" test="//bf:Instance[1]/bf:provisionActivity/bf:ProvisionActivity/bf:date = '200X'"/>
       <x:expect label="c or d in pos 6 adds a status" test="//bf:Instance[7]/bf:provisionActivity/bf:ProvisionActivity/bf:status/bf:Status/rdfs:label = 'ceased'"/>
       <x:expect label="...with URI" test="//bf:Instance[7]/bf:provisionActivity/bf:ProvisionActivity/bf:status/bf:Status/@rdf:about = 'http://id.loc.gov/vocabulary/mstatus/ceased'"/>