@natlibfi/marc-record-validators-melinda 12.1.0-alpha.1 → 13.0.0

package/src/translate-terms.js

@@ -4,6 +4,9 @@ import {fieldHasSubfield, fieldToString, nvdebug} from './utils.js';
 
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:translate-terms');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
+
 const defaultTags = ['648', '650', '651', '655'];
 
 const swapLanguageCode = {'fin': 'swe', 'fi': 'sv', 'sv': 'fi', 'swe': 'fin'};
@@ -12,6 +15,7 @@ const changeAbbrHash = {'fi': 'fin', 'fin': 'fi', 'sv': 'swe', 'swe': 'sv'};
 const termCache = {};
 
 // Author(s): Nicholas Volk
+// eslint-disable-next-line max-lines-per-function
 export default function () {
 
 
@@ -23,7 +27,7 @@ export default function () {
   async function fix(record) {
     const newFields = await getFields(record, defaultTags, []);
 
-    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debug));
+    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debugDev));
 
     newFields.forEach(nf => record.insertField(nf));
 
@@ -60,12 +64,12 @@ export default function () {
       return [];
     }
     const fields = record.get(tag);
-    const finnishFields = fields.filter(f => isRelevantField(f, 'fin'));
-    const swedishFields = fields.filter(f => isRelevantField(f, 'swe'));
+    const finnishFields = fields.filter(f => isTranslatable(f, 'fin'));
+    const swedishFields = fields.filter(f => isTranslatable(f, 'swe'));
     const finnishOnly = getMisses(finnishFields, swedishFields);
     const swedishOnly = getMisses(swedishFields, finnishFields);
 
-    //console.log(` Looking at ${finnishOnly.length} + ${swedishOnly.length} fields`); // eslint-disable-line no-console
+    //nvdebug(` Looking at ${finnishOnly.length} + ${swedishOnly.length} fields`, debugDev);
     return [...finnishOnly, ...swedishOnly].filter(f => tagAndFieldAgree(f));
 
     function tagAndFieldAgree(field) {
@@ -79,6 +83,7 @@ export default function () {
     const pairlessFields = getPairlessFinnishAndSwedishFields(record, tag);
 
     // Dunno how to handle loop+promise combo in our normal coding style. Spent half a day trying... (I reckon it takes like 2 minuts to do this properly...)
+    // Did a proper implementation in drop-terms.js...
     let prefLabels = [];
     for (let i=0; i < pairlessFields.length; i += 1) {
       prefLabels[i] = await getPrefLabel(pairlessFields[i]);
@@ -92,12 +97,12 @@ export default function () {
     if (!prefLabels) {
       return undefined;
     }
-    //console.log(`pairField() WP 1: ${fieldToString(field)}`); // eslint-disable-line no-console
+    //nvdebug(`pairField() WP 1: ${fieldToString(field)}`, debugDev);
     const lexAndLang = getLexiconAndLanguage(field);
-    //console.log(`pairField() WP 2: ${JSON.stringify(lexAndLang)}`); // eslint-disable-line no-console
+    //nvdebug(`pairField() WP 2: ${JSON.stringify(lexAndLang)}`, debugDev);
     const twoLetterOtherLang = swapLanguageCodeBetweenLanguages(changeAbbr(lexAndLang.lang));
     const prefLabel = prefLabels.find(l => l.lang === twoLetterOtherLang);
-    //console.log(`pairField() WP 4: ${JSON.stringify(prefLabel)}`); // eslint-disable-line no-console
+    //nvdebug(`pairField() WP 4: ${JSON.stringify(prefLabel)}`, debugDev);
     const sfA = {'code': 'a', 'value': prefLabel.value}; // field.subfields.field(sf => sf.code === 'a');
     const sf0 = clone(field.subfields.find(sf => sf.code === '0'));
     const sf2 = {'code': '2', 'value': `${lexAndLang.lex}/${lexAndLang.lang === 'fin' ? 'swe' : 'fin'}`}; // swap fin <=> swe
@@ -105,119 +110,48 @@ export default function () {
     return newField;
   }
 
-  function getLexiconAndLanguage(field) {
-    const subfield2 = field.subfields.find(sf => sf.code === '2');
-    if (subfield2.value === 'slm/fin') {
-      return {'lex': 'slm', 'lang': 'fin'};
-    }
-    if (subfield2.value === 'slm/swe') {
-      return {'lex': 'slm', 'lang': 'swe'};
-    }
-    if (subfield2.value === 'yso/fin') {
-      return {'lex': 'yso', 'lang': 'fin'};
-    }
-    if (subfield2.value === 'yso/swe') {
-      return {'lex': 'yso', 'lang': 'swe'};
-    }
-    return {};
-  }
+
 
   async function getPrefLabel(field) {
-    // Tag vs $2 correlation has already been checked!
+    // Pre-requisite: tag vs $2 correlation has already been checked!
     const uri = fieldToUri(field);
     if (!uri) { // $0 is invalid or sumthing
       return undefined;
     }
-    const prefLabels = await getTermData(uri);
-    if (!prefLabels) { // Sanity check. Miss caused by illegal id etc.
-      nvdebug(`No labels found for ${uri}`, debug);
+
+    const data = await getTermData(uri);
+
+    if (!data) { // Sanity check. Miss caused by illegal id etc.
+      nvdebug(`No labels found for ${uri}`, debugDev);
       return undefined;
     }
-    const lexData = getLexiconAndLanguage(field); // $2 data
-    const lang = changeAbbr(lexData.lang);
 
+    const prefLabels = data.prefLabel;
 
+    const lexData = getLexiconAndLanguage(field); // $2 data
+    const lang = changeAbbr(lexData.lang); // fi <=> fin (finto use 2 chars, we use 3-letters)
     const subfieldA = field.subfields.find(sf => sf.code === 'a');
 
-    const prefLabel = prefLabels.find(pl => pl.lang === lang);
-    //console.info(`Compare prefLabel '${prefLabel.value}' AND $a '${subfieldA.value}'`); // eslint-disable-line no-console
-    if (prefLabel.value === subfieldA.value) {
-      nvdebug(`'${fieldToString(field)}' requires translating`, debug);
+    if (isLabel(prefLabels, subfieldA.value, lang)) {
       return prefLabels;
     }
     return undefined;
   }
 
-  function swapLanguageCodeBetweenLanguages(code) {
-    if (swapLanguageCode[code]) {
-      return swapLanguageCode[code];
-    }
-    return code;
-  }
-
-  function changeAbbr(abbr) {
-    if (changeAbbrHash[abbr]) {
-      return changeAbbrHash[abbr];
-    }
-    return abbr;
-  }
-
-  function swaggerQuery(uri) {
-    // This would work for only yso, not yso-paikat etc `https://api.finto.fi/rest/v1/yso/data?format=application%2Fjson&uri=${uri}`;
-    return `https://api.finto.fi/rest/v1/data?uri=${uri}&format=application%2Fjson`; // This is simpler, but contains more irrelevant data
-  }
-
-  async function getTermData(uri) {
-    //console.log(`getTermData(${uri})`); // eslint-disable-line no-console
-    if (termCache[uri]) { // Don't think current implementation uses the cache any more.
-      //console.log(`CACHED ${uri}`); // eslint-disable-line no-console
-      return termCache[uri];
-    }
-    const tmp = await getTermDataFromFinto(uri);
-    termCache[uri] = tmp;
-    return tmp;
-  }
-
-  async function getTermDataFromFinto(uri) {
-    const headers = {'Accept': 'application/json'};
-    const uri2 = swaggerQuery(uri);
-
-    const response = await fetch(uri2, {method: 'GET', headers});
-    if (!response.ok) {
-      return undefined;
-    }
-    const json = await response.json();
-
-    if (!json.graph) {
-      return undefined;
-    }
-    const arr = json.graph;
-    const [hit] = arr.filter(row => row.uri === uri);
-    //console.log(`NEW JSON: ${JSON.stringify(hit.prefLabel)}`); // eslint-disable-line no-console
-    return hit.prefLabel;
-  }
-
 
   function fieldToUri(field) {
     const lex = mapTagToLex(field.tag);
 
     const subfield0 = field.subfields.find(sf => sf.code === '0');
     const id = subfield0.value.replace(/^[^0-9]+/u, '');
-    if (lex === 'yso') {
-      //return `http%3A%2F%2Fwww.yso.fi%2Fonto%2Fyso%2Fp${id}`;
-      return `http://www.yso.fi/onto/yso/p${id}`;
-    }
-    if (lex === 'slm') {
-      return `http://urn.fi/URN:NBN:fi:au:slm:s${id}`;
-    }
-    return undefined;
+    return buildUri(lex, id);
   }
 
-  function isRelevantField(field, lang) {
+  function isTranslatable(field, lang) {
     const fieldAsString = fieldToString(field);
 
     // We should probably allow an optional $8 as the first subfield.
-    if (!fieldAsString.match(/^... #7 ‡a [^‡]+ ‡2 [^‡]+ ‡0 [^‡]+(?: ‡9 [A-Z]+<(?:KEEP|DROP)>)*$/u)) {
+    if (!fieldAsString.match(/^... #7 (?: ‡8 [^‡]+ )*‡a [^‡]+ ‡2 [^‡]+ ‡0 [^‡]+(?: ‡9 [A-Z]+<(?:KEEP|DROP)>)*$/u)) {
       return false;
     }
     const lex = mapTagToLex(field.tag);
@@ -228,17 +162,6 @@ export default function () {
     return fieldHasValidSubfield0(field);
   }
 
-  function fieldHasValidSubfield0(field) {
-    const lex = mapTagToLex(field.tag);
-    const subfield0 = field.subfields.find(sf => sf.code === '0');
-    if (lex === 'yso' && subfield0.value.match(/^http:\/\/www\.yso\.fi\/onto\/yso\/p[0-9]+$/u)) {
-      return true;
-    }
-    if (lex === 'slm' && subfield0.value.match(/^http:\/\/urn\.fi\/URN:NBN:fi:au:slm:s[0-9]+$/u)) {
-      return true;
-    }
-    return false;
-  }
 
   function getMisses(fieldList1, fieldList2) {
     return fieldList1.filter(f => !hasSubfield0Match(f, fieldList2));
@@ -250,12 +173,7 @@ export default function () {
   }
 
 
-  function mapTagToLex(tag) {
-    if (tag === '655') {
-      return 'slm';
-    }
-    return 'yso';
-  }
+
 
 
   /*
@@ -269,3 +187,144 @@ export default function () {
 
 }
 
+export function fieldHasValidSubfield0(field, defaultLex = undefined) {
+  const lex = defaultLex || mapTagToLex(field.tag);
+  return field.subfields.some(sf => isValidSubfield0(sf, lex));
+}
+
+export function isValidSubfield0(subfield, lex = '???') {
+  if (subfield.code !== '0') {
+    return false;
+  }
+  // 2025-12-10: supports both http and https as well. Note that translation will copy the original $0 idenfifier even though it might be non-standard.
+  // Note that currently 'http' is teh standard!!!
+  if (['yso', 'yso/fin', 'yso/swe'].includes(lex) && subfield.value.match(/^https?:\/\/www\.yso\.fi\/onto\/yso\/p[0-9]+$/u)) {
+    return true;
+  }
+  if (['slm', 'slm/fin', 'slm/swe'].includes(lex) && subfield.value.match(/^https?:\/\/urn\.fi\/URN:NBN:fi:au:slm:s[0-9]+$/u)) {
+    return true;
+  }
+  return false;
+}
+
+
+export function buildUri(lex, id) {
+  if (['yso', 'yso/fin', 'yso/swe'].includes(lex)) {
+    //return `http%3A%2F%2Fwww.yso.fi%2Fonto%2Fyso%2Fp${id}`;
+    return `http://www.yso.fi/onto/yso/p${id}`;
+  }
+  if (['slm', 'slm/fin', 'slm/swe'].includes(lex)) {
+    return `http://urn.fi/URN:NBN:fi:au:slm:s${id}`;
+  }
+  return undefined;
+}
+
+function mapTagToLex(tag) {
+  if (tag === '655') {
+    return 'slm';
+  }
+  return 'yso';
+}
+
+export async function getTermData(uri) {
+  nvdebug(`getTermData(${uri})`, debugDev);
+  if (termCache[uri]) { // Don't think current implementation uses the cache any more.
+    //nvdebug(`CACHED ${uri}`, debugDev);
+    return termCache[uri];
+  }
+  const tmp = await getTermDataFromFinto(uri);
+  termCache[uri] = tmp;
+  return tmp;
+}
+
+async function getTermDataFromFinto(uri) {
+    const headers = {'Accept': 'application/json'};
+    const uri2 = swaggerQuery(uri);
+
+    const response = await fetch(uri2, {method: 'GET', headers});
+    if (!response.ok) {
+      return undefined;
+    }
+    const json = await response.json();
+
+    if (!json.graph) {
+      return undefined;
+    }
+    const arr = json.graph;
+    const [hit] = arr.filter(row => row.uri === uri);
+    const subset = {
+      prefLabel: processLabel(hit?.prefLabel || undefined),
+      altLabel: processLabel(hit?.altLabel || undefined)
+    };
+    //nvdebug(`NEW JSON: ${JSON.stringify(hit)}`, debugDev);
+
+    return subset;
+
+    function swaggerQuery(uri) {
+      // This would work for only yso, not yso-paikat etc `https://api.finto.fi/rest/v1/yso/data?format=application%2Fjson&uri=${uri}`;
+      return `https://api.finto.fi/rest/v1/data?uri=${uri}&format=application%2Fjson`; // This is simpler, but contains more irrelevant data
+    }
+
+    function processLabel(label) {
+      if (typeof label === 'object') {
+        if (Array.isArray(label)) {
+          return label;
+        }
+        return [label];
+      }
+      return [];
+    }
+}
+
+export function getLexiconAndLanguage(field) {
+  // Assumes that field has exactly one $2
+  const subfield2 = field.subfields.find(sf => sf.code === '2');
+  if (subfield2) {
+    if (subfield2.value === 'slm/fin') {
+      return {'lex': 'slm', 'lang': 'fin'};
+    }
+    if (subfield2.value === 'slm/swe') {
+      return {'lex': 'slm', 'lang': 'swe'};
+    }
+    if (subfield2.value === 'yso/fin') {
+      return {'lex': 'yso', 'lang': 'fin'};
+    }
+    if (subfield2.value === 'yso/swe') {
+      return {'lex': 'yso', 'lang': 'swe'};
+    }
+  }
+  return {};
+}
+
+
+
+export function isLabel(labels, term, lang = undefined) {
+  const twoLetterLanguageCode = lang && lang.length === 3 ? changeAbbr(lang) : lang;
+  return labels.some(l => isMatch(l));
+
+  function isMatch(label) {
+    if (label.value !== term) {
+      return false;
+    }
+    if (!twoLetterLanguageCode) { // If language code is not defined, any hit will do
+      return true;
+    }
+    return label.lang === twoLetterLanguageCode;
+  }
+}
+
+
+  function changeAbbr(abbr) {
+    if (changeAbbrHash[abbr]) {
+      return changeAbbrHash[abbr];
+    }
+    return abbr;
+  }
+
+
+  function swapLanguageCodeBetweenLanguages(code) {
+    if (swapLanguageCode[code]) {
+      return swapLanguageCode[code];
+    }
+    return code;
+  }

package/src/translate-terms.test.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 import fetchMock from 'fetch-mock';
 
 import validatorFactory from './translate-terms.js';
@@ -17,7 +17,7 @@ const uris = [
   'http://urn.fi/URN:NBN:fi:au:slm:s161'
 ];
 
-
+const useMock = false;
 
 generateTests({
   callback,
@@ -30,20 +30,21 @@ 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});
-
+      if (useMock){ 
+        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();
     }
   }
 });
 
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-terms:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-terms:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -53,12 +54,7 @@ async function testValidatorFactory() {
   assert.equal(typeof validator.validate, 'function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/src/typeOfDate-008.js

@@ -1,6 +1,9 @@
 import createDebugLogger from 'debug';
+import { nvdebug } from './utils.js';
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/typeOfDate-008');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 export default function () {
   return {
@@ -15,7 +18,7 @@ export default function () {
     const c1114 = f008.value.substring(11, 15);
     // if 008 06 = s, and 11-14 = #### (not year/digits)
     if (c06 === 't' && !(/[0-9u]{4}/u).test(c1114)) {
-      debug('is t and not valid 1114');
+      nvdebug('is t and not valid 1114', debugDev);
       return {valid: false, message: 'Invalid 008 06'};
     }
 

package/src/update-field-540.js

@@ -1,7 +1,9 @@
 //import createDebugLogger from 'debug';
-import {fieldToString} from './utils.js';
+import {fieldToString /*, nvdebug*/} from './utils.js';
 
 //const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/update-field-540');
+//const debugData = debug.extend('data');
+//const debugDev = debug.extend('dev');
 
 // Author(s): Nicholas Volk
 export default function () {
@@ -54,7 +56,7 @@ function validLicenseInSubfieldC(subfieldC, license) {
   if (subfieldC.code !== 'c') {
     return false;
   }
-  //nvdebug(`Compare ${subfieldC.value} vs ${license.license}`);
+  //nvdebug(`Compare ${subfieldC.value} vs ${license.license}`, debugDev);
   return license.license === subfieldC.value;
 }
 
@@ -62,7 +64,7 @@ function validUrlInSubfieldU(subfieldU, license) {
   if (subfieldU.code !== 'u') {
     return false;
   }
-  //nvdebug(`Compare ${subfieldU.value} vs ${license.url}`);
+  //nvdebug(`Compare ${subfieldU.value} vs ${license.url}`, debugDev);
   return license.url === subfieldU.value;
 }
 
@@ -78,12 +80,12 @@ function fieldHasOldCcLicense(field, fix) {
   if (field.tag !== '540') {
     return false;
   }
-  //nvdebug(`NORM 540: ${fieldToString(field)}`);
+  //nvdebug(`NORM 540: ${fieldToString(field)}`, debugDev);
   const validLicense = licences.find(license => field.subfields.some(sf => validLicenseInSubfieldC(sf, license)) && field.subfields.some(sf => validUrlInSubfieldU(sf, license)));
   if (!validLicense) {
     return false;
   }
-  //nvdebug(` Found valid license`);
+  //nvdebug(` Found valid license`, debugDev);
   if (fix) {
     const subfieldsC = field.subfields.filter(sf => validLicenseInSubfieldC(sf, validLicense));
     subfieldsC.forEach(c => fixC(field, c));

package/src/update-field-540.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './update-field-540.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -20,7 +20,7 @@ generateTests({
   }
 });
 
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/update-field-540:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/update-field-540:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -33,12 +33,7 @@ async function testValidatorFactory() {
   assert(validator.validate).to.be.a('function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/src/urn.js

@@ -1,14 +1,17 @@
 //import fetch from 'node-fetch';
-import {isElectronicMaterial} from './utils.js';
+import {isElectronicMaterial, nvdebug} from './utils.js';
 import createDebugLogger from 'debug';
 
 const URN_GENERATOR_URL = 'https://generator.urn.fi/cgi-bin/urn_generator.cgi?type=nbn';
 
+// eslint-disable-next-line max-lines-per-function
 export default function (isLegalDeposit = false, useMelindaTemp = true) {
   const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:urn');
   const debugData = debug.extend('data');
+  const debugDev = debug.extend('dev');
 
-  //console.log(`IS LEGAL DEPOSIT? ${isLegalDeposit ? 'YES' : 'NO'}`); // eslint-disable-line no-console
+
+  //nvdebug(`IS LEGAL DEPOSIT? ${isLegalDeposit ? 'YES' : 'NO'}`, debugDev); // eslint-disable-line no-console
 
   // We should check that the f856 with URN has second indicator '0' (Resource), ' ' (No information provided) or '8' (No display constant generated)
   // - if second indicator is '1' (Version of resource) or '2' (Related resource) the URN in f856 is not correct for the resource described in the record
@@ -35,12 +38,13 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
     fix
   };
 
+  // eslint-disable-next-line max-lines-per-function
   async function fix(record) {
     const f856sUrn = record.fields.filter(hasLegalDepositURN);
-    debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);
+    nvdebug(`f856sUrn: ${JSON.stringify(f856sUrn)}`, debugDev);
 
     const ldSubfields = isLegalDeposit ? createLDSubfields() : [];
-    debugData(`IsLegalDeposit: ${isLegalDeposit}, LegalDepositSubfields: ${JSON.stringify(ldSubfields)}`);
+    nvdebug(`IsLegalDeposit: ${isLegalDeposit}, LegalDepositSubfields: ${JSON.stringify(ldSubfields)}`, debugDev);
 
     // We add the URN even if we're not getting the legalDeposit - where does this URN resolve?
     // We probably should not do these additions
@@ -111,7 +115,7 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
         return acc;
       }, undefined);
 
-      debugData(`isbns: ${isbn}`);
+      nvdebug(`isbns: ${isbn}`, debugDev);
 
       const {generated, value} = await createURN(isbn);
       return {code: 'u', value, generated};
@@ -161,12 +165,12 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
   }
 
   function validateLD(f856sUrn) {
-    debug(`Validating the existence of legal deposit subfields`);
+    nvdebug(`Validating the existence of legal deposit subfields`, debugDev);
     const ldSubfields = createLDSubfields();
     const f856sUrnWithLdSubfields = f856sUrn.filter(field => fieldHasLDSubfields(field, ldSubfields));
     if (f856sUrnWithLdSubfields.length > 0) {
-      debug(`Record has ${f856sUrnWithLdSubfields.length} URN fields with all necessary legal deposit subfields`);
-      debugData(`f856sUrnWithLdSubfields: ${JSON.stringify(f856sUrnWithLdSubfields)}`);
+      nvdebug(`Record has ${f856sUrnWithLdSubfields.length} URN fields with all necessary legal deposit subfields`, debugDev);
+      nvdebug(`f856sUrnWithLdSubfields: ${JSON.stringify(f856sUrnWithLdSubfields)}`, debugData);
       return true;
     }
     return false;
@@ -175,22 +179,22 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
   function validate(record) {
     // if not electronic skip this validator
     if (!isElectronicMaterial(record)) {
-      debug(`Record is not electronic - no need to validate legal deposit URNs`);
+      nvdebug(`Record is not electronic - no need to validate legal deposit URNs`, debugDev);
       return {valid: true};
     }
 
     const f856sUrn = record.fields.filter(hasLegalDepositURN);
 
     if (f856sUrn.length > 0) {
-      debug(`Record has ${f856sUrn.length} URN fields`);
-      debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);
+      nvdebug(`Record has ${f856sUrn.length} URN fields`, debugDev);
+      nvdebug(`f856sUrn: ${JSON.stringify(f856sUrn)}`, debugData);
 
       if (!isLegalDeposit || validateLD(f856sUrn)) {
-        debug(`Record is valid`);
+        nvdebug(`Record is valid`, debugDev);
         return {valid: true};
       }
     }
-    debug(`No (valid) URN fields - Record is not valid`);
+    nvdebug(`No (valid) URN fields - Record is not valid`, debugDev);
     return {valid: false};
   }
 }

package/src/urn.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './urn.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -19,7 +19,7 @@ generateTests({
     }
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/urn:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/urn:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -29,12 +29,7 @@ async function testValidatorFactory() {
   assert.equal(typeof validator.validate, 'function');
 }
 
-async function callback({getFixture, enabled = true, fix = true, isLegalDeposit = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = true, isLegalDeposit = false}) {
   const validator = await validatorFactory(isLegalDeposit);
   const record = new MarcRecord(getFixture('input.json'));
   const expectedResult = getFixture('result.json');