@natlibfi/marc-record-validators-melinda 12.0.0-alpha.6 → 12.0.0-alpha.8

package/src/indicator-fixes.js

@@ -171,6 +171,18 @@ function normalize245Indicator1(field, record) {
   field.ind1 = field1XX.length === 0 ? '0' : '1';
 }
 
+function noDisplayConstantGenerated520Indicator1(field) {
+  if (field.tag !== '520') {
+    return;
+  }
+  const as = field.subfields.filter(sf => sf.code === 'a');
+  // Set ind1=8 "no display constant generated" fro certain values (part of MELKEHITYS-2579):
+  if (as.length === 1 && ['Abstract.', 'Abstrakt.', 'Abstrakti.', 'Abstract.', 'English Summary.', 'Sammandrag.', 'Tiivistelmä.'].includes(field.subfields[0].value)) {
+    field.ind1 = '8';
+  }
+
+}
+
 function normalize776Indicator2(field) {
   if (field.tag !== '776') {
     return;
@@ -242,6 +254,7 @@ function recordNormalizeIndicators(record) {
 function fieldNormalizeIndicators(field, record, languages) {
   normalize084Indicator1(field);
   normalize245Indicator1(field, record);
+  noDisplayConstantGenerated520Indicator1(field);
   normalizeNonFilingIndicator1(field, languages);
   normalizeNonFilingIndicator2(field, languages);
   normalize776Indicator2(field);

package/src/merge-fields/dataProvenance.js

@@ -2,7 +2,7 @@
 
 import {subfieldArraysContainSameData} from "../utils.js";
 
-function tagToDataProvenanceSubfieldCode(tag) {
+export function tagToDataProvenanceSubfieldCode(tag) {
     if ( ['533', '800', '810', '811', '830'].includes(tag)) {
         return 'y';
     }

package/src/punctuation2.js

@@ -10,9 +10,10 @@
 *          (They are jumped over when looking for next (non-controlfield subfield)
 */
 import {validateSingleField} from './ending-punctuation.js';
+import {tagToDataProvenanceSubfieldCode} from './merge-fields/dataProvenance.js';
 import {fieldGetUnambiguousTag} from './subfield6Utils.js';
 //import createDebugLogger from 'debug';
-import {fieldToString, nvdebug} from './utils.js';
+import {fieldToString, isControlSubfieldCode, nvdebug} from './utils.js';
 import clone from 'clone';
 
 //const debug = createDebugLogger('debug/punctuation2');
@@ -49,12 +50,19 @@ export default function () {
   }
 }
 
-function isControlSubfield(subfield) {
-  return ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].includes(subfield.code);
+
+
+function isIrrelevantSubfield(subfield, tag) {
+  const dataProvenanceSubfieldCode = tagToDataProvenanceSubfieldCode(tag);
+  if (subfield.code === dataProvenanceSubfieldCode) {
+    return true;
+  }
+  return isControlSubfieldCode(subfield.code); // Currently this contains other stuff as well ($3, $4, $7, $9...)
 }
 
+
 function getNextRelevantSubfield(field, currSubfieldIndex) {
-  return field.subfields.find((subfield, index) => index > currSubfieldIndex && !isControlSubfield(subfield));
+  return field.subfields.find((subfield, index) => index > currSubfieldIndex && !isIrrelevantSubfield(subfield, field.tag));
 }
 
 export function fieldGetFixedString(field, add = true) {
@@ -155,7 +163,8 @@ const remove490And830Whatever = [{'code': 'axyzv', 'followedBy': 'axyzv', 'remov
 const linkingEntryRemoveWhatever = [
   {'code': 'i', 'followedBy': 'at', 'remove': / ?:$/u}, // ':'
   {'code': 'at', 'remove': /\.$/u},
-  {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz', 'remove': /\. -$/u}
+  // Only ". -" separator is still used in music. We can strip it, but can only create the non-music punctuation!
+  {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz#', 'remove': /\. -$/u}
 ];
 
 

package/src/translate-terms.test.js

@@ -1,9 +1,23 @@
 import assert from 'node:assert';
-import {MarcRecord} from '@natlibfi/marc-record';
+import createDebugLogger from 'debug';
+import fetchMock from 'fetch-mock';
+
 import validatorFactory from './translate-terms.js';
+
+import {MarcRecord} from '@natlibfi/marc-record';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+import {fakeData} from '../test-fixtures/translate-terms-data.js';
+
+const uris = [
+  'http://www.yso.fi/onto/yso/p13299',
+  'http://www.yso.fi/onto/yso/p111739',
+  'http://www.yso.fi/onto/yso/p6197061979',
+  'http://www.yso.fi/onto/yso/p6196061969',
+  'http://urn.fi/URN:NBN:fi:au:slm:s161'
+];
+
+
 
 generateTests({
   callback,
@@ -15,6 +29,15 @@ generateTests({
   },
   hooks: {
     before: async () => {
+
+      fetchMock.mockGlobal()
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[0]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[1]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[2]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[3]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[4]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData});
+
+
       testValidatorFactory();
     }
   }

package/src/utils.js

@@ -103,6 +103,12 @@ export function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {
 }
 
 export function isControlSubfieldCode(subfieldCode) {
+  // NB! Only $w, $0, $1, $5, $6 and $8 are really control subfields. In Finland $9 is oft a control subfield
+  // $3 material (part of the whole thing)
+  // $4 means 'relationship' (similar to relator terms at least in X00 and similar)
+  // $7 is usually provinance subfield. However, it can be stored in other subfields as well. See merge-fields/dataProvenance.js for details
+  // However, change this only if needed. Maybe all provinance subfields should return true?
+  // This may become relevant when AI starts to create stuff...
   if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {
     return true;
   }

package/test-fixtures/indicator-fixes/10/expectedResult.json

@@ -0,0 +1,11 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    { "tag": "005", "value": "20220202020202.0" },
+    { "tag": "520", "ind1": "8", "ind2": " ", "subfields": [ {"code": "a", "value": "Abstrakti."}, {"code": "9", "value": "TESTI<KEEP>"} ]},
+    { "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Whatever."}]},
+    { "tag": "520", "ind1": "8", "ind2": " ", "subfields": [ {"code": "a", "value": "Tiivistelmä."}]}
+
+  ],
+  "leader": ""
+}

package/test-fixtures/indicator-fixes/10/metadata.json

@@ -0,0 +1,4 @@
+{
+  "description": "10: certain value have ind1=8 as per MELKEHITYS-2579",
+  "fix": true
+}

package/test-fixtures/indicator-fixes/10/record.json

@@ -0,0 +1,11 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    { "tag": "005", "value": "20220202020202.0" },
+    { "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Abstrakti."}, {"code": "9", "value": "TESTI<KEEP>"} ]},
+    { "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Whatever."}]},
+    { "tag": "520", "ind1": "3", "ind2": " ", "subfields": [ {"code": "a", "value": "Tiivistelmä."}]}
+
+  ],
+  "leader": ""
+}

package/test-fixtures/translate-terms-data.js

@@ -0,0 +1,42 @@
+const fakeTerms = {
+    graph: [
+        {
+            uri: 'http://www.yso.fi/onto/yso/p13299',
+            prefLabel: [
+                { lang: 'fi', value: 'laiturit' },
+                { lang: 'sv', value: 'bryggor'}
+            ]
+        },
+        {
+            uri: 'http://www.yso.fi/onto/yso/p111739',
+            prefLabel: [
+                { lang: 'fi', value: 'Ivalo (Inari)' },
+                { lang: 'sv', value: 'Ivalo (Enare)'}
+            ]
+        },
+        {
+            uri: 'http://www.yso.fi/onto/yso/p6197061979',
+            prefLabel: [
+                { lang: 'fi', value: '1970-luku' },
+                { lang: 'sv', value: '1970-talet' }
+            ]
+        },
+        {
+            uri: 'http://www.yso.fi/onto/yso/p6196061969',
+            prefLabel: [
+                { lang: 'fi', value: '1960-luku' },
+                { lang: 'sv', value: '1960-talet' }
+            ]
+        },
+        {
+            uri: 'http://urn.fi/URN:NBN:fi:au:slm:s161',
+            prefLabel: [
+                { lang: 'fi', value: 'naistenlehdet' },
+                { lang: 'sv', value: 'damtidningar' }
+            ]
+        }
+    ]
+
+};
+
+export const fakeData = JSON.stringify(fakeTerms);