Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fieldmerge2validator #215

Merged
merged 26 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
812b897
Update dependencies. NB! marc-record-validators-melinda uses a dev br…
nvolk Aug 15, 2024
7bf8a9a
Comment out no longer used code
nvolk Aug 15, 2024
965f516
update deps
nvolk Aug 15, 2024
59e482e
remove obsolete file
nvolk Aug 15, 2024
2bc2f22
remove obsolete file
nvolk Aug 15, 2024
c694fb2
Remove obsolete commented local code
nvolk Aug 15, 2024
9782ccf
getCounterpart() : local version -> validator version
nvolk Aug 15, 2024
9db2ee1
Remove obsolete file (replaced by validator)
nvolk Aug 15, 2024
8f67f78
Remove obsolete file; replaced by a validator
nvolk Aug 15, 2024
21b90b3
Remove obsolete file; replaced by a validator
nvolk Aug 15, 2024
cb279e7
Remove obsolete file; replaced but a validator
nvolk Aug 15, 2024
c4d6935
Remove obsolete file; replaced by a validator
nvolk Aug 15, 2024
d5892a9
Remove obsolete file; replaced by validator code
nvolk Aug 15, 2024
78543f7
Modify comments
nvolk Aug 15, 2024
8d90a87
Update deps
ammsalme Aug 19, 2024
b763e24
Use mergeOrAddPostprocess.js from validators
nvolk Aug 20, 2024
55ed651
update dependencies
nvolk Aug 20, 2024
8703424
Temporarily allow wrong subfield order in test result.
nvolk Aug 20, 2024
1d65105
Use appropriate subfield $e order in tests
nvolk Aug 20, 2024
3d587b0
remove obsolete field
nvolk Aug 20, 2024
7194135
Refactor a bit
nvolk Aug 20, 2024
02df681
refactor
nvolk Aug 20, 2024
13bca22
rename internal variables and functions
nvolk Aug 20, 2024
f6f7c36
Remove file (use validator code instead)
nvolk Aug 20, 2024
6eb476f
Refactor code
nvolk Aug 20, 2024
bec97f6
minor code simplifications
nvolk Aug 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
398 changes: 98 additions & 300 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@
"watch:test": "cross-env DEBUG=1 NODE_ENV=test nodemon -w src -w test-fixtures --exec 'npm run test:dev'"
},
"dependencies": {
"@natlibfi/marc-record": "^9.0.0",
"@natlibfi/marc-record-merge": "^7.0.3",
"@natlibfi/marc-record-validate": "^8.0.8",
"@natlibfi/marc-record-validators-melinda": "^11.3.1",
"@natlibfi/melinda-commons": "^13.0.15",
"@natlibfi/marc-record": "^9.0.1",
"@natlibfi/marc-record-merge": "^7.0.5",
"@natlibfi/marc-record-validate": "^8.0.10",
"@natlibfi/marc-record-validators-melinda": "^11.3.2",
"debug": "^4.3.6",
"isbn3": "^1.1.51"
},
Expand All @@ -51,9 +50,9 @@
"@babel/preset-env": "^7.25.3",
"@babel/register": "^7.24.6",
"@natlibfi/eslint-config-melinda-backend": "^3.0.5",
"@natlibfi/fixugen": "^2.0.8",
"@natlibfi/fixura": "^3.0.7",
"babel-plugin-istanbul": "^6.1.1",
"@natlibfi/fixugen": "^2.0.9",
"@natlibfi/fixura": "^3.0.8",
"babel-plugin-istanbul": "^7.0.0",
"babel-plugin-rewire": "^1.2.0",
"chai": "^4.5.0",
"cross-env": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/reducers/addField.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import createDebugLogger from 'debug';
import {tagIsRepeatable, fieldToString, nvdebug} from './utils';

import {MarcRecord} from '@natlibfi/marc-record';
import {postprocessRecords} from './mergeOrAddPostprocess.js';
import {postprocessRecords} from '@natlibfi/marc-record-validators-melinda/dist/merge-fields/mergeOrAddPostprocess';
import {preprocessBeforeAdd} from './processFilter.js';
import fs from 'fs';
import path from 'path';
Expand Down
2 changes: 1 addition & 1 deletion src/reducers/controlFieldUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function hasLegalLength(field) {
//nvdebug(`${c0}: COMPARE ${f007Lengths[c0]} vs ${field.value.length}`, debugDev);
return field.value.length === f007Lengths[c0];
}
return false; // Sanity check. It's ok that no test reaches this poin.
return false; // Sanity check. It's ok that no test reaches this point.
}

if (field.tag === '008') {
Expand Down
307 changes: 0 additions & 307 deletions src/reducers/controlSubfields.js

This file was deleted.

Loading
Loading