@natlibfi/marc-record-validators-melinda 12.0.0-alpha.1 → 12.0.0-alpha.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/{melinda-node-tests.yml → melinda-node-tests-and-publish.yml} +36 -11
- package/dist/access-rights.test.js +1 -1
- package/dist/access-rights.test.js.map +1 -1
- package/dist/addMissingField337.test.js +1 -1
- package/dist/addMissingField337.test.js.map +1 -1
- package/dist/addMissingField338.test.js +1 -1
- package/dist/addMissingField338.test.js.map +1 -1
- package/dist/cyrillux-usemarcon-replacement.test.js +4 -7
- package/dist/cyrillux-usemarcon-replacement.test.js.map +2 -2
- package/dist/cyrillux.test.js +1 -1
- package/dist/cyrillux.test.js.map +1 -1
- package/dist/double-commas.test.js +1 -1
- package/dist/double-commas.test.js.map +1 -1
- package/dist/empty-fields.test.js +1 -1
- package/dist/empty-fields.test.js.map +1 -1
- package/dist/ending-punctuation-conf.js +6 -4
- package/dist/ending-punctuation-conf.js.map +2 -2
- package/dist/ending-punctuation.js +88 -18
- package/dist/ending-punctuation.js.map +3 -3
- package/dist/ending-punctuation.test.js +198 -103
- package/dist/ending-punctuation.test.js.map +2 -2
- package/dist/field-008-18-34-character-groups.test.js +1 -1
- package/dist/field-008-18-34-character-groups.test.js.map +1 -1
- package/dist/field-structure.test.js +1 -1
- package/dist/field-structure.test.js.map +1 -1
- package/dist/index.js +122 -59
- package/dist/index.js.map +2 -2
- package/dist/indicator-fixes.js +11 -1
- package/dist/indicator-fixes.js.map +2 -2
- package/dist/isbn-issn.js +8 -5
- package/dist/isbn-issn.js.map +2 -2
- package/dist/melindaCustomMergeFields.js +1 -1
- package/dist/melindaCustomMergeFields.js.map +2 -2
- package/dist/merge-fields/counterpartField.js +5 -0
- package/dist/merge-fields/counterpartField.js.map +2 -2
- package/dist/merge-fields/dataProvenance.js +29 -0
- package/dist/merge-fields/dataProvenance.js.map +7 -0
- package/dist/merge-fields/index.js +11 -2
- package/dist/merge-fields/index.js.map +2 -2
- package/dist/merge-fields/mergeField.js +1 -1
- package/dist/merge-fields/mergeField.js.map +2 -2
- package/dist/merge-fields.test.js +4 -2
- package/dist/merge-fields.test.js.map +2 -2
- package/dist/mergeField500Lisapainokset.js +1 -1
- package/dist/mergeField500Lisapainokset.js.map +2 -2
- package/dist/normalizeFieldForComparison.js +24 -0
- package/dist/normalizeFieldForComparison.js.map +2 -2
- package/dist/punctuation2.js +11 -5
- package/dist/punctuation2.js.map +2 -2
- package/dist/removeInferiorDataFields.js +2 -1
- package/dist/removeInferiorDataFields.js.map +2 -2
- package/dist/resolveOrphanedSubfield6s.js +1 -1
- package/dist/resolveOrphanedSubfield6s.js.map +2 -2
- package/dist/sortSubfields.js +5 -5
- package/dist/sortSubfields.js.map +2 -2
- package/dist/translate-terms.test.js +12 -2
- package/dist/translate-terms.test.js.map +2 -2
- package/dist/utils.js +9 -3
- package/dist/utils.js.map +2 -2
- package/package.json +22 -23
- package/src/access-rights.test.js +1 -1
- package/src/addMissingField337.test.js +1 -1
- package/src/addMissingField338.test.js +1 -1
- package/src/cyrillux-usemarcon-replacement.test.js +4 -9
- package/src/cyrillux.test.js +1 -1
- package/src/double-commas.test.js +1 -1
- package/src/empty-fields.test.js +1 -1
- package/src/ending-punctuation-conf.js +6 -5
- package/src/ending-punctuation.js +115 -24
- package/src/ending-punctuation.test.js +187 -104
- package/src/field-008-18-34-character-groups.test.js +1 -1
- package/src/field-structure.test.js +1 -1
- package/src/index.js +132 -59
- package/src/indicator-fixes.js +14 -1
- package/src/isbn-issn.js +11 -6
- package/src/melindaCustomMergeFields.js +1 -1
- package/src/merge-fields/counterpartField.js +6 -0
- package/src/merge-fields/dataProvenance.js +41 -0
- package/src/merge-fields/index.js +11 -2
- package/src/merge-fields/mergeField.js +2 -2
- package/src/merge-fields.test.js +6 -2
- package/src/mergeField500Lisapainokset.js +1 -1
- package/src/normalizeFieldForComparison.js +26 -0
- package/src/punctuation2.js +14 -5
- package/src/removeInferiorDataFields.js +4 -1
- package/src/resolveOrphanedSubfield6s.js +1 -1
- package/src/sortSubfields.js +7 -5
- package/src/translate-terms.test.js +25 -2
- package/src/utils.js +19 -3
- package/test-fixtures/indicator-fixes/10/expectedResult.json +11 -0
- package/test-fixtures/indicator-fixes/10/metadata.json +4 -0
- package/test-fixtures/indicator-fixes/10/record.json +11 -0
- package/test-fixtures/merge-fields/f05/expectedResult.json +24 -0
- package/test-fixtures/merge-fields/f05/metadata.json +6 -0
- package/test-fixtures/merge-fields/f05/record.json +30 -0
- package/test-fixtures/remove-inferior-datafields/f16/expectedResult.json +12 -0
- package/test-fixtures/remove-inferior-datafields/f16/metadata.json +5 -0
- package/test-fixtures/remove-inferior-datafields/f16/record.json +14 -0
- package/test-fixtures/translate-terms-data.js +42 -0
- package/src/melindaCustomMergeFields.json +0 -5120
|
@@ -1,9 +1,23 @@
|
|
|
1
1
|
import assert from 'node:assert';
|
|
2
|
-
import
|
|
2
|
+
import createDebugLogger from 'debug';
|
|
3
|
+
import fetchMock from 'fetch-mock';
|
|
4
|
+
|
|
3
5
|
import validatorFactory from './translate-terms.js';
|
|
6
|
+
|
|
7
|
+
import {MarcRecord} from '@natlibfi/marc-record';
|
|
4
8
|
import {READERS} from '@natlibfi/fixura';
|
|
5
9
|
import generateTests from '@natlibfi/fixugen';
|
|
6
|
-
import
|
|
10
|
+
import {fakeData} from '../test-fixtures/translate-terms-data.js';
|
|
11
|
+
|
|
12
|
+
const uris = [
|
|
13
|
+
'http://www.yso.fi/onto/yso/p13299',
|
|
14
|
+
'http://www.yso.fi/onto/yso/p111739',
|
|
15
|
+
'http://www.yso.fi/onto/yso/p6197061979',
|
|
16
|
+
'http://www.yso.fi/onto/yso/p6196061969',
|
|
17
|
+
'http://urn.fi/URN:NBN:fi:au:slm:s161'
|
|
18
|
+
];
|
|
19
|
+
|
|
20
|
+
|
|
7
21
|
|
|
8
22
|
generateTests({
|
|
9
23
|
callback,
|
|
@@ -15,6 +29,15 @@ generateTests({
|
|
|
15
29
|
},
|
|
16
30
|
hooks: {
|
|
17
31
|
before: async () => {
|
|
32
|
+
|
|
33
|
+
fetchMock.mockGlobal()
|
|
34
|
+
.get(`https://api.finto.fi/rest/v1/data?uri=${uris[0]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
|
|
35
|
+
.get(`https://api.finto.fi/rest/v1/data?uri=${uris[1]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
|
|
36
|
+
.get(`https://api.finto.fi/rest/v1/data?uri=${uris[2]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
|
|
37
|
+
.get(`https://api.finto.fi/rest/v1/data?uri=${uris[3]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
|
|
38
|
+
.get(`https://api.finto.fi/rest/v1/data?uri=${uris[4]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData});
|
|
39
|
+
|
|
40
|
+
|
|
18
41
|
testValidatorFactory();
|
|
19
42
|
}
|
|
20
43
|
}
|
package/src/utils.js
CHANGED
|
@@ -7,7 +7,7 @@ const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:ut
|
|
|
7
7
|
//const debugData = debug.extend('data');
|
|
8
8
|
const debugDev = debug.extend('dev');
|
|
9
9
|
|
|
10
|
-
import {
|
|
10
|
+
import {melindaFieldSpecs} from './melindaCustomMergeFields.js';
|
|
11
11
|
|
|
12
12
|
//JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'src', 'melindaCustomMergeFields.json'), 'utf8'));
|
|
13
13
|
|
|
@@ -103,6 +103,12 @@ export function nvdebugFieldArray(fields, prefix = ' ', func = undefined) {
|
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
export function isControlSubfieldCode(subfieldCode) {
|
|
106
|
+
// NB! Only $w, $0, $1, $5, $6 and $8 are really control subfields. In Finland $9 is oft a control subfield
|
|
107
|
+
// $3 material (part of the whole thing)
|
|
108
|
+
// $4 means 'relationship' (similar to relator terms at least in X00 and similar)
|
|
109
|
+
// $7 is usually provinance subfield. However, it can be stored in other subfields as well. See merge-fields/dataProvenance.js for details
|
|
110
|
+
// However, change this only if needed. Maybe all provinance subfields should return true?
|
|
111
|
+
// This may become relevant when AI starts to create stuff...
|
|
106
112
|
if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {
|
|
107
113
|
return true;
|
|
108
114
|
}
|
|
@@ -176,7 +182,7 @@ export function subfieldIsRepeatable(tag, subfieldCode) {
|
|
|
176
182
|
return true;
|
|
177
183
|
}
|
|
178
184
|
|
|
179
|
-
const fieldSpecs =
|
|
185
|
+
const fieldSpecs = melindaFieldSpecs.fields.filter(field => field.tag === tag);
|
|
180
186
|
if (fieldSpecs.length !== 1) {
|
|
181
187
|
nvdebug(` WARNING! Getting field ${tag} data failed! ${fieldSpecs.length} hits. Default value true is used for'${subfieldCode}' .`, debugDev);
|
|
182
188
|
return true;
|
|
@@ -193,7 +199,7 @@ export function subfieldIsRepeatable(tag, subfieldCode) {
|
|
|
193
199
|
}
|
|
194
200
|
|
|
195
201
|
function marc21GetTagsLegalIndicators(tag) {
|
|
196
|
-
const fieldSpecs =
|
|
202
|
+
const fieldSpecs = melindaFieldSpecs.fields.filter(field => field.tag === tag);
|
|
197
203
|
if (fieldSpecs.length === 0) {
|
|
198
204
|
return undefined;
|
|
199
205
|
}
|
|
@@ -232,3 +238,13 @@ export function hasCopyright(value) {
|
|
|
232
238
|
const modValue = removeCopyright(value);
|
|
233
239
|
return value !== modValue;
|
|
234
240
|
}
|
|
241
|
+
|
|
242
|
+
|
|
243
|
+
|
|
244
|
+
export function subfieldArraysContainSameData(arr1, arr2) {
|
|
245
|
+
if ( !arr1.every(sf => arr2.some(sf2 => subfieldsAreIdentical(sf, sf2))) ) {
|
|
246
|
+
return false;
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
return arr2.every(sf2 => arr1.some(sf => subfieldsAreIdentical(sf, sf2)));
|
|
250
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_validationOptions": {},
|
|
3
|
+
"fields": [
|
|
4
|
+
{ "tag": "005", "value": "20220202020202.0" },
|
|
5
|
+
{ "tag": "520", "ind1": "8", "ind2": " ", "subfields": [ {"code": "a", "value": "Abstrakti."}, {"code": "9", "value": "TESTI<KEEP>"} ]},
|
|
6
|
+
{ "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Whatever."}]},
|
|
7
|
+
{ "tag": "520", "ind1": "8", "ind2": " ", "subfields": [ {"code": "a", "value": "Tiivistelmä."}]}
|
|
8
|
+
|
|
9
|
+
],
|
|
10
|
+
"leader": ""
|
|
11
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_validationOptions": {},
|
|
3
|
+
"fields": [
|
|
4
|
+
{ "tag": "005", "value": "20220202020202.0" },
|
|
5
|
+
{ "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Abstrakti."}, {"code": "9", "value": "TESTI<KEEP>"} ]},
|
|
6
|
+
{ "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Whatever."}]},
|
|
7
|
+
{ "tag": "520", "ind1": "3", "ind2": " ", "subfields": [ {"code": "a", "value": "Tiivistelmä."}]}
|
|
8
|
+
|
|
9
|
+
],
|
|
10
|
+
"leader": ""
|
|
11
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_validationOptions": {},
|
|
3
|
+
"fields": [
|
|
4
|
+
{ "tag": "001", "value": "f05" },
|
|
5
|
+
|
|
6
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "$7 does not merge"}, {"code": "2", "value": "yso/fin"}]},
|
|
7
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "$7 does not merge"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "(dpenmw)AI"}]},
|
|
8
|
+
|
|
9
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "non-$7 merges"}, {"code": "2", "value": "yso/fin"}, {"code": "0", "value": "something else"}]},
|
|
10
|
+
|
|
11
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "Identical $7s can merge"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "(dpenmw)AI"}]},
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
{ "tag": "773", "ind1": " ", "ind2": " ", "subfields": [
|
|
15
|
+
{ "code": "7", "value": "abcd"},
|
|
16
|
+
{ "code": "t", "value": "Merges since $7 is not a data provenance subfield."},
|
|
17
|
+
{ "code": "o", "value": "ABC-123"},
|
|
18
|
+
{ "code": "x", "value": "1234567890"},
|
|
19
|
+
{ "code": "w", "value": "(FI-MELINDA)020000000"}
|
|
20
|
+
]}
|
|
21
|
+
],
|
|
22
|
+
"leader": "01331cam a22003498i 4500"
|
|
23
|
+
|
|
24
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_validationOptions": {},
|
|
3
|
+
"fields": [
|
|
4
|
+
{ "tag": "001", "value": "f05" },
|
|
5
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "$7 does not merge"}, {"code": "2", "value": "yso/fin"}]},
|
|
6
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "$7 does not merge"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "(dpenmw)AI"}]},
|
|
7
|
+
|
|
8
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "non-$7 merges"}, {"code": "2", "value": "yso/fin"}]},
|
|
9
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "non-$7 merges"}, {"code": "2", "value": "yso/fin"}, {"code": "0", "value": "something else"}]},
|
|
10
|
+
|
|
11
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "Identical $7s can merge"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "(dpenmw)AI"}]},
|
|
12
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "Identical $7s can merge"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "(dpenmw)AI"}]},
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
{ "tag": "773", "ind1": " ", "ind2": " ", "subfields": [
|
|
16
|
+
{ "code": "7", "value": "abcd"},
|
|
17
|
+
{ "code": "t", "value": "Merges since $7 is not a data provenance subfield."},
|
|
18
|
+
{ "code": "x", "value": "1234567890"},
|
|
19
|
+
{ "code": "w", "value": "(FI-MELINDA)020000000"}
|
|
20
|
+
]},
|
|
21
|
+
{ "tag": "773", "ind1": " ", "ind2": " ", "subfields": [
|
|
22
|
+
{ "code": "7", "value": "abcd"},
|
|
23
|
+
{ "code": "t", "value": "Merges since $7 is not a data provenance subfield."},
|
|
24
|
+
{ "code": "o", "value": "ABC-123"},
|
|
25
|
+
{ "code": "w", "value": "(FI-MELINDA)020000000"}
|
|
26
|
+
]}
|
|
27
|
+
],
|
|
28
|
+
"leader": "01331cam a22003498i 4500"
|
|
29
|
+
|
|
30
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_validationOptions": {},
|
|
3
|
+
"fields": [
|
|
4
|
+
{ "tag": "001", "value": "f16" },
|
|
5
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi1"}, {"code": "2", "value": "yso/fin"}]},
|
|
6
|
+
|
|
7
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi2"}, {"code": "2", "value": "yso/fin"}]},
|
|
8
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi2"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "something else"}]}
|
|
9
|
+
],
|
|
10
|
+
"leader": "01331cam a22003498i 4500"
|
|
11
|
+
|
|
12
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_validationOptions": {},
|
|
3
|
+
"fields": [
|
|
4
|
+
{ "tag": "001", "value": "f16" },
|
|
5
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi1"}, {"code": "2", "value": "yso/fin"}]},
|
|
6
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi1"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "(dpenmw)AI"}]},
|
|
7
|
+
|
|
8
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi2"}, {"code": "2", "value": "yso/fin"}]},
|
|
9
|
+
{ "tag": "650", "ind1": " ", "ind2": "7", "subfields": [ { "code": "a", "value": "termi2"}, {"code": "2", "value": "yso/fin"}, {"code": "7", "value": "something else"}]}
|
|
10
|
+
|
|
11
|
+
],
|
|
12
|
+
"leader": "01331cam a22003498i 4500"
|
|
13
|
+
|
|
14
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
const fakeTerms = {
|
|
2
|
+
graph: [
|
|
3
|
+
{
|
|
4
|
+
uri: 'http://www.yso.fi/onto/yso/p13299',
|
|
5
|
+
prefLabel: [
|
|
6
|
+
{ lang: 'fi', value: 'laiturit' },
|
|
7
|
+
{ lang: 'sv', value: 'bryggor'}
|
|
8
|
+
]
|
|
9
|
+
},
|
|
10
|
+
{
|
|
11
|
+
uri: 'http://www.yso.fi/onto/yso/p111739',
|
|
12
|
+
prefLabel: [
|
|
13
|
+
{ lang: 'fi', value: 'Ivalo (Inari)' },
|
|
14
|
+
{ lang: 'sv', value: 'Ivalo (Enare)'}
|
|
15
|
+
]
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
uri: 'http://www.yso.fi/onto/yso/p6197061979',
|
|
19
|
+
prefLabel: [
|
|
20
|
+
{ lang: 'fi', value: '1970-luku' },
|
|
21
|
+
{ lang: 'sv', value: '1970-talet' }
|
|
22
|
+
]
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
uri: 'http://www.yso.fi/onto/yso/p6196061969',
|
|
26
|
+
prefLabel: [
|
|
27
|
+
{ lang: 'fi', value: '1960-luku' },
|
|
28
|
+
{ lang: 'sv', value: '1960-talet' }
|
|
29
|
+
]
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
uri: 'http://urn.fi/URN:NBN:fi:au:slm:s161',
|
|
33
|
+
prefLabel: [
|
|
34
|
+
{ lang: 'fi', value: 'naistenlehdet' },
|
|
35
|
+
{ lang: 'sv', value: 'damtidningar' }
|
|
36
|
+
]
|
|
37
|
+
}
|
|
38
|
+
]
|
|
39
|
+
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
export const fakeData = JSON.stringify(fakeTerms);
|