@natlibfi/marc-record-validators-melinda 12.0.7 → 12.0.8

package/src/addMissingField336.js

@@ -1,11 +1,16 @@
-//import createDebugLogger from 'debug';
+import createDebugLogger from 'debug';
 import {fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
 import {getFormOfItem, map336CodeToTerm} from './field33XUtils.js';
 
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:addMissingField336');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
+
 const description = 'Add missing 336 field(s)';
 
 // const multimediaRegexp = /multimedia/ui;
 
+// eslint-disable-next-line max-lines-per-function
 export default function () {
 
   return {
@@ -13,9 +18,9 @@ export default function () {
   };
 
   function fix(record) {
-    nvdebug(`FIX ${description}...`);
+    nvdebug(`FIX ${description}...`, debugDev);
     const newFields = getMissing336s(record);
-    nvdebug(` GOT ${newFields.length}...`);
+    nvdebug(` GOT ${newFields.length}...`, debugDev);
     // FFS: we actually need newFields array here! Videogame, for example, might be
     // 336 ## ‡a kaksiulotteinen liikkuva kuva ‡b tdi ‡2 rdacontent
     // 336 ## ‡a tietokoneohjelma ‡b cop ‡2 rdacontent
@@ -28,7 +33,7 @@ export default function () {
   }
 
   function validate(record) {
-    nvdebug(`VALIDATE ${description}...`);
+    nvdebug(`VALIDATE ${description}...`, debugDev);
     const newFields = getMissing336s(record);
     if (newFields.length === 0) {
       return {message: [], valid: true};
@@ -251,7 +256,7 @@ export default function () {
     }
 
     const bees = guessMissing336Bs(record); // bees = b-subfields
-    nvdebug(` WE HAVE ${bees.length} BEES: ${bees.join(', ')}`);
+    nvdebug(` WE HAVE ${bees.length} BEES: ${bees.join(', ')}`, debugDev);
 
 
     return bees.map(b => codeToField(b, getCatalogingLanguage(record, 'fin')));

package/src/addMissingField337.js

@@ -1,7 +1,11 @@
-//import createDebugLogger from 'debug';
+import createDebugLogger from 'debug';
 import {fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
 import {getFormOfItem, map337CodeToTerm} from './field33XUtils.js';
 
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:addMissingField337');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
+
 const description = 'Add missing 337 field(s)';
 
 // Based on https://github.com/NatLibFi/USEMARCON-Cyrillux/blob/master/008-23-337a.tbl . Extended!
@@ -27,7 +31,7 @@ export default function () {
   };
 
   function fix(record) {
-    nvdebug(`FIX ${description}...`);
+    nvdebug(`FIX ${description}...`, debugDev);
     const newField = getMissing337(record);
     const res = {message: [], fix: [], valid: true};
     if (newField) {
@@ -39,7 +43,7 @@ export default function () {
   }
 
   function validate(record) {
-    nvdebug(`VALIDATE ${description}....`);
+    nvdebug(`VALIDATE ${description}....`, debugDev);
     const newField = getMissing337(record);
     if (!newField) {
       return {message: [], valid: true};
@@ -101,7 +105,7 @@ export default function () {
   function getMissing337(record) {
     const [f337] = record.get('337');
     if (f337) {
-      // nvdebug(fieldToString(f337));
+      // nvdebug(fieldToString(f337), debugDev);
       return undefined;
     }
 
@@ -122,7 +126,7 @@ export default function () {
 }
 
 function mapFormOfItemToField337B(formOfItem) {
-  nvdebug(`mapping ${formOfItem} to 337$b`);
+  nvdebug(`mapping ${formOfItem} to 337$b`, debugDev);
 
   const [result] = mappings337B.filter(row => row.formOfItem === formOfItem);
   if (result) {

package/src/addMissingField338.js

@@ -1,10 +1,15 @@
-//import createDebugLogger from 'debug';
+import createDebugLogger from 'debug';
 import {fieldHasSubfield, fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
 import {getFormOfItem, map338CodeToTerm} from './field33XUtils.js';
 
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:addMissingField338');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
+
 // Based mostly on USEMARCON-RDA. However, many things have been rethought, modernized etc.
 const description = 'Add missing 338 field(s)';
 
+// eslint-disable-next-line max-lines-per-function
 export default function () {
 
   return {
@@ -12,7 +17,7 @@ export default function () {
   };
 
   function fix(record) {
-    nvdebug(`FIX ${description}...`);
+    nvdebug(`FIX ${description}...`, debugDev);
     const newField = getMissing338(record);
     const res = {message: [], fix: [], valid: true};
 
@@ -25,7 +30,7 @@ export default function () {
   }
 
   function validate(record) {
-    nvdebug(`VALIDATE ${description}...`);
+    nvdebug(`VALIDATE ${description}...`, debugDev);
     const newField = getMissing338(record);
     if (!newField) {
       return {message: [], valid: true};
@@ -57,7 +62,7 @@ export default function () {
     if (!extent) {
       return undefined;
     }
-    nvdebug(`AUDIO EXTENT: '${extent}`);
+    nvdebug(`AUDIO EXTENT: '${extent}`, debugDev);
     if (extent.match(/^(?:audio discs?|[^ ]*ljudskiva|[^ ]*ljudskivor|LP-levy|LP-levyä|LP-skiva|LP-skivor|[^ ]*äänilevy)$/iu)) {
       return 'sd';
     }
@@ -173,7 +178,7 @@ export default function () {
   }
 
   function extentToCarrierType(record) {
-    nvdebug(`EXTENT2CARRIERTYPE`);
+    nvdebug(`EXTENT2CARRIERTYPE`, debugDev);
     return extentToAudioCarrierType(record) ||
       extentToComputerCarrierType(record) ||
       extentToMicroformCarrierType(record) ||
@@ -288,7 +293,7 @@ export default function () {
   }
 
   function audioToField338(record) {
-    nvdebug('AUDIO-TO-338');
+    nvdebug('AUDIO-TO-338', debugDev);
     const typeOfRecord = record.getTypeOfRecord(record);
     if (typeOfRecord !== 'i' && typeOfRecord !== 'j') {
       return undefined;

package/src/cyrillux-usemarcon-replacement.js

@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+
 /*
 *  cyrillux-usemarcon-replacement.js -- implement and improve https://github.com/NatLibFi/USEMARCON-Cyrillux/tree/master
 *
@@ -6,6 +8,7 @@
 */
 
 import clone from 'clone';
+import createDebugLogger from 'debug';
 import {MarcRecord} from '@natlibfi/marc-record';
 import {default as fix33X} from './fix-33X.js';
 import {default as add041} from './addMissingField041.js';
@@ -19,11 +22,11 @@ import {default as fixIndicators} from './indicator-fixes.js';
 import {default as fixPunctuation} from './punctuation2.js';
 import {default as fixQualifyingInformation} from './normalize-qualifying-information.js';
 import {sortAdjacentSubfields} from './sortSubfields.js';
-
-// import createDebugLogger from 'debug';
 import {fieldHasSubfield, nvdebug, recordRemoveValuelessSubfields, recordToString, removeSubfield} from './utils.js';
 
-// const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2');
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/cyrillux-usermarcon-replacement');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const description = 'Replacement for Cyrillux usemarcon rules';
 
@@ -32,13 +35,14 @@ const description = 'Replacement for Cyrillux usemarcon rules';
 const dropTags = ['001', '003', '010', '012', '014', '015', '016', '017', '019', '025', '029', '032', '035', '036', '037', '038', '042', '044', '049', '051', '061', '068', '071', '074', '079', '090', '091', '092', '094', '095', '096', '097', '099', '249', '261', '262', '350', '400', '411', '541', '561', '562', '574', '575', '577', '578', '583', '584', '589', '590', '591', '592', '593', '594', '595', '596', '597', '598', '599', '653', '698', '741', '742', '744', '751', '761', '790', '841', '842', '843', '844', '845', '850', '852', '853', '854', '855', '858', '859', '863', '864', '865', '866', '867', '868', '876', '877', '878', '882', '886', '887', '888', '890', '899'];
 
 
+// eslint-disable-next-line max-lines-per-function
 export default function () {
   return {
     description, fix, validate
   };
 
   function fix(record) {
-    nvdebug(`${description}: fix`);
+    nvdebug(`${description}: fix`, debugDev);
     realFix(record);
     const res = {message: [], fix: [], valid: true};
     return res;
@@ -156,7 +160,7 @@ export default function () {
 
   // Validation is currently done in subparts
   function validate(record) {
-    nvdebug(`${description}: validate`);
+    nvdebug(`${description}: validate`, debugDev);
     const originalString = recordToString(record);
     const clonedRecord = new MarcRecord(record, {subfieldValues: false});
     realFix(clonedRecord);

package/src/cyrillux.js

@@ -9,11 +9,17 @@ import {default as sortFields} from './sortFields.js';
 import {default as reindexSubfield6OccurenceNumbers} from './reindexSubfield6OccurenceNumbers.js';
 import {fieldStripPunctuation} from './punctuation2.js';
 import {getLanguageCode} from './addMissingField041.js';
+import createDebugLogger from 'debug';
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/cyrillux');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const iso9Trans = 'ISO9 <TRANS>';
 const cyrillicTrans = 'CYRILLIC <TRANS>';
 const sfs4900Trans = 'SFS4900 <TRANS>';
 
+// eslint-disable-next-line max-lines-per-function
 export default function (config = {}) {
   // console.log(`CONFIG=${JSON.stringify(config)}`); // eslint-disable-line no-console
 
@@ -135,7 +141,7 @@ export default function (config = {}) {
     // Discussion: We should probably also skip others like 05X-08X, 648, 650, 651, and 655, but this needs thinking...
     // Also I'd like to convert do CYRILLIC->ISO-9 in field 300 (and others?) without 880 mappings... (<- not implemented)
 
-    // nvdebug(`fieldCanBeTransliterated('${fieldToString(field)}') in...`);
+    // nvdebug(`fieldCanBeTransliterated('${fieldToString(field)}') in...`, debugDev);
     if (!tagCanBeTransliterated(field.tag)) {
       return false;
     }
@@ -175,10 +181,10 @@ export default function (config = {}) {
     }
     const conversionResult = sfs4900.convertToLatin(subfield.value, inputLang);
 
-    console.log(JSON.stringify(conversionResult));
+    nvdebug(`${JSON.stringify(conversionResult)}`, debugDev);
     const result = conversionResult.result;
-    console.log(JSON.stringify(result));
-    //console.log(`VAL: ${subfield.value} => ${value} using ${lang}`); // eslint-disable-line no-console
+    nvdebug(`${JSON.stringify(result)}`, debugDev);
+    //nvdebug(`VAL: ${subfield.value} => ${value} using ${lang}`, debugDev);
     return {code: subfield.code, value: result};
   }
 
@@ -256,7 +262,7 @@ export default function (config = {}) {
     if (!config.retainCyrillic) {
       return undefined;
     }
-    nvdebug(`Derive CYR 880 from ${fieldToString(field)}`);
+    nvdebug(`Derive CYR 880 from ${fieldToString(field)}`, debugDev);
     const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
     const newSubfield9 = fieldHasSubfield(field, '9', cyrillicTrans) ? [] : [{code: '9', value: cyrillicTrans}];
     const subfields = [
@@ -266,7 +272,7 @@ export default function (config = {}) {
     ];
 
     const newField = {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};
-    nvdebug(`   New CYR 880      ${fieldToString(newField)}`);
+    nvdebug(`   New CYR 880      ${fieldToString(newField)}`, debugDev);
     return newField;
   }
 
@@ -317,8 +323,8 @@ export default function (config = {}) {
 
     // Paired field: $9 CYRILLIC <TRANS> is the only legal <TRANS>
     const [pairedField] = existingPairedFields;
-    nvdebug(`LOOKING FOR SFS4900 PAIR: ${fieldToString(field)}`);
-    nvdebug(`     HAVING PAIRED FIELD: ${fieldToString(pairedField)}`);
+    nvdebug(`LOOKING FOR SFS4900 PAIR: ${fieldToString(field)}`, debugDev);
+    nvdebug(`     HAVING PAIRED FIELD: ${fieldToString(pairedField)}`, debugDev);
     if (!fieldContainsCyrillicCharacters(pairedField)) {
       return false;
     }
@@ -332,7 +338,7 @@ export default function (config = {}) {
     const languageCode = getLanguageCode(record);
     const field2 = fieldToString(createFieldForSfs4900Comparison(mapFieldToSfs4900(pairedField, occurrenceNumberAsString, languageCode), field.tag));
     const field1 = fieldToString(createFieldForSfs4900Comparison(field, field.tag));
-    nvdebug(`COMPARE CONTENTS:\n  '${field1}' vs\n  '${field2}': ${field1 === field2 ? 'OK' : 'FAIL'}`);
+    nvdebug(`COMPARE CONTENTS:\n  '${field1}' vs\n  '${field2}': ${field1 === field2 ? 'OK' : 'FAIL'}`, debugDev);
     return field1 === field2;
   }
 
@@ -377,17 +383,17 @@ export default function (config = {}) {
       return [originalField];
     }
 
-    // nvdebug(`PROCESSING: ${fieldToString(originalField)}`);
+    // nvdebug(`PROCESSING: ${fieldToString(originalField)}`, debugDev);
 
     const newOccurrenceNumberAsInt = getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber);
     const newOccurrenceNumberAsString = intToOccurrenceNumberString(newOccurrenceNumberAsInt);
     const languageCode = getLanguageCode(record);
 
-    // nvdebug(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`);
+    // nvdebug(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`, debugDev);
 
     const existingPairedFields = fieldGetOccurrenceNumberPairs(originalField, record.get('880'));
 
-    // nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`);
+    // nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`, debugDev);
 
     const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9
     const newCyrillicField = retainCyrillic(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC

package/src/disambiguateSeriesStatements.js

@@ -9,6 +9,8 @@ import {fieldFixPunctuation} from './punctuation2.js';
 //const {default: createNatlibfiSruClient} = natlibfiSruClient;
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:disambiguateSeriesStatements');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const ELECTRONIC = 1;
 const PRINTED = 2;
@@ -16,6 +18,7 @@ const NEITHER_OR_UNKNOWN = 0;
 const SRU_API_URL = 'https://sru.api.melinda.kansalliskirjasto.fi/bib';
 
 // Author(s): Nicholas Volk
+// eslint-disable-next-line max-lines-per-function
 export default function () {
   const sruClient = createSruClient(SRU_API_URL);
 
@@ -79,7 +82,7 @@ export default function () {
     }
 
     const deletableStrings = deletableXs.map(sf => subfieldToString(sf));
-    nvdebug(`Field has removable ISSNS: '${deletableStrings.join(', ')}`, debug);
+    nvdebug(`Field has removable ISSNS: '${deletableStrings.join(', ')}`, debugDev);
 
     // fixer:
     if (reallyFix) {

package/src/drop-terms.js

@@ -6,7 +6,8 @@ import {fieldToString, nvdebug} from './utils.js';
 import {getLexiconAndLanguage, getTermData, isLabel, isValidSubfield0} from './translate-terms.js';
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:drop-terms');
-
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const defaultConfig = {
   'constraints': [
@@ -25,6 +26,7 @@ const defaultConfig = {
   'remove 0-less': true
 };
 
+// eslint-disable-next-line max-lines-per-function
 export default function (config = defaultConfig) {
 
   return {
@@ -112,7 +114,7 @@ export default function (config = defaultConfig) {
   }
 
   async function isRemovableField(field) {
-    // nvdebug(`FOO===== ${fieldToString(field)}`);
+    // nvdebug(`FOO===== ${fieldToString(field)}`, debugDev);
 
 
     // $0-less field:
@@ -132,15 +134,15 @@ export default function (config = defaultConfig) {
 
         // $a is the pref label. All is fine!
         if (isLabel(data.prefLabel, subfieldA.value, lexData.lang)) {
-          debug(`altLabel found: ${subfieldA.value}`);
+          nvdebug(`altLabel found: ${subfieldA.value}`, debugDev);
           return false;
         }
         if (isLabel(data.altLabel, subfieldA.value, lexData.lang)) {
-          debug(`altLabel found: ${subfieldA.value}`);
+          nvdebug(`altLabel found: ${subfieldA.value}`, debugDev);
           // Oddly enough this could remove altLabel but keep totally invalid labels...
           return config['remove altLabel'];
         }
-        debug(`a-2-0 mismatch: ${fieldToString(field)}`);
+        nvdebug(`a-2-0 mismatch: ${fieldToString(field)}`, debugDev);
       }
     }
 
@@ -148,7 +150,7 @@ export default function (config = defaultConfig) {
     if (config['keep invalid label']) {
       // We keep the label $a. However, we can get rid of $0 if we want to (semantic reasons)
       if (!config['keep invalid url']) {
-        nvdebug(`=============== 0-removal`);
+        nvdebug(`=============== 0-removal`, debugDev);
         field.subfields = field.subfields.filter(sf => sf.code !== '0');
       }
       return false;

package/src/fix-33X.js

@@ -1,10 +1,13 @@
-//import createDebugLogger from 'debug';
+import createDebugLogger from 'debug';
 import clone from 'clone';
 import {fieldToString, getCatalogingLanguage, nvdebug} from './utils.js';
 import {map336CodeToTerm, map337CodeToTerm, map338CodeToTerm} from './field33XUtils.js';
 
-const description = 'Fix non-RDA 33X field(s)';
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-33X');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
+const description = 'Fix non-RDA 33X field(s)';
 
 const map336 = {
   'Bild (kartografisk ; att vidra)': 'crt',
@@ -366,6 +369,7 @@ const map338 = {
 
 // const multimediaRegexp = /multimedia/ui;
 
+// eslint-disable-next-line max-lines-per-function
 export default function () {
 
   return {
@@ -373,11 +377,11 @@ export default function () {
   };
 
   function fix(record) {
-    nvdebug(`FIX ${description}...`);
+    nvdebug(`FIX ${description}...`, debugDev);
     const catLang = getCatalogingLanguage(record) || 'fin';
     const fields = getRelevantFields(record);
     fields.forEach(f => fixField(f, catLang));
-    nvdebug(` GOT ${fields.length}...`);
+    nvdebug(` GOT ${fields.length}...`, debugDev);
     // FFS: we actually need newFields array here! Videogame, for example, might be
     // 336 ## ‡a kaksiulotteinen liikkuva kuva ‡b tdi ‡2 rdacontent
     // 336 ## ‡a tietokoneohjelma ‡b cop ‡2 rdacontent
@@ -387,7 +391,7 @@ export default function () {
   }
 
   function validate(record) {
-    nvdebug(`VALIDATE ${description}...`); // NOT READY YET
+    nvdebug(`VALIDATE ${description}...`, debugDev); // NOT READY YET
     const catLang = getCatalogingLanguage(record) || 'fin';
     const fields = getRelevantFields(record);
     if (fields.length === 0) {
@@ -414,7 +418,7 @@ export default function () {
 
 
   function mapTermToCode(term, tag) {
-    nvdebug(`TERM/${tag}: '${term}'`);
+    nvdebug(`TERM/${tag}: '${term}'`, debugDev);
     if (tag === '336' && term in map336) {
       return map336[term];
     }

package/src/fix-country-codes.js

@@ -4,8 +4,12 @@
 //
 // Author(s): Nicholas Volk
 
-//import createDebugLogger from 'debug';
-//import {fieldToString, nvdebug} from './utils.js';
+import createDebugLogger from 'debug';
+import {nvdebug} from './utils.js';
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-country-codes');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 
 export default function () {
@@ -16,7 +20,7 @@ export default function () {
   };
 
   function fix(record) {
-    //nvdebug(`FIX ME`);
+    nvdebug(`FIX ME:`, debugDev);
     const res = {message: [], fix: [], valid: true};
 
     const [field008] = record.get('008');

package/src/fix-language-codes.js

@@ -1,20 +1,24 @@
 import clone from 'clone';
-import {fieldToString} from './utils.js';
+import {fieldToString, nvdebug} from './utils.js';
+import createDebugLogger from 'debug';
+
 // Fix language codes in 008/35-37 and 041 (does not sync them)
 //
 // Author(s): Nicholas Volk
 
-//import createDebugLogger from 'debug';
-//import {fieldToString, nvdebug} from './utils.js';
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-language-codes');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 const description = 'Fix language codes';
 
+// eslint-disable-next-line max-lines-per-function
 export default function () {
 
   return {description, validate, fix};
 
   function fix(record) {
-    //nvdebug(`FIX ME`);
+    nvdebug(`FIX ME`, debugDev);
     const res = {message: [], fix: [], valid: true};
 
     const [field008] = record.get('008');

package/src/fix-sami-041.js

@@ -3,12 +3,14 @@
 import createDebugLogger from 'debug';
 import clone from 'clone';
 
-import {fieldToString} from './utils.js';
+import {fieldToString, nvdebug} from './utils.js';
 
 const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:fix-sami-041');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
 
 
-
+// eslint-disable-next-line max-lines-per-function
 export default function () {
   /* 'sma': eteläsaame, 'sme': pohjoissaame, 'smj': luulajansaame, 'smn': inarinsaame, 'sms': koltansaame */
   const samiLanguages = ['sma', 'sme', 'smj', 'smn', 'sms'];
@@ -21,7 +23,7 @@ export default function () {
 
   function getRelevantSubfieldCodes(record) { // Maybe this should be an exportable utility function...
     if (record && record.leader && record.leader[6]) {
-      debug(` LDR/06 is '${record.leader[6]}'`);
+     nvdebug(` LDR/06 is '${record.leader[6]}'`, debugDev);
       // We should test this properly...
       if (['i', 'j'].includes(record.leader[6])) { // Check type of record: sound recordings use 'd'
         return ['d'];
@@ -34,13 +36,13 @@ export default function () {
 
 
   function fix(record, validateMode = false) {
-    debug(`Start ${validateMode ? 'validator' : 'fixer'}`);
+   nvdebug(`Start ${validateMode ? 'validator' : 'fixer'}`, debugDev);
     const relevantSubfieldCodes = getRelevantSubfieldCodes(record);
-    debug(` Relevant subfield codes are '${relevantSubfieldCodes.join("', '")}'`);
+   nvdebug(` Relevant subfield codes are '${relevantSubfieldCodes.join("', '")}'`, debugDev);
     const relevantFields = record.fields.filter(f => isRelevantField(f, relevantSubfieldCodes)).map(f => validateMode ? clone(f) : f); // NV! relevant fields are cloned in validation mode!
     // Nothing to do:
     if (relevantFields.length === 0) {
-      debug(` No relevant f041 fields found`);
+     nvdebug(` No relevant f041 fields found`, debugDev);
       if (validateMode) {
         return {message: [], valid: true};
       }
@@ -63,22 +65,22 @@ export default function () {
       const [f008] = record.get('008').map(f => validateMode ? clone(f) : f);
 
       if (!f008) {
-        debug(' WARNING: no f008 found');
+       nvdebug(' WARNING: no f008 found'), debugDev;
         return [];
       }
       const currLang = f008.value.substr(35, 3);
       if (!samiLanguages.includes(currLang)) { // NB! If original 008/35-37 was not a sami language, we don't change anything!
-        debug(` Existing 008/35-37 '${currLang}' is not a sami language. No need to update 008/35-37`);
+       nvdebug(` Existing 008/35-37 '${currLang}' is not a sami language. No need to update 008/35-37`, debugDev);
         return [];
       }
       const origValue = f008.value;
       const firstRelevantSubfield = relevantFields[0].subfields.find(sf => relevantSubfieldCodes.includes(sf.code));
       if (firstRelevantSubfield.value !== 'smi') {
-         debug(` First relevant subfield is '\$${firstRelevantSubfield.code} ${firstRelevantSubfield.value}'. No need to update 008/35-37`);
+        nvdebug(` First relevant subfield is '\$${firstRelevantSubfield.code} ${firstRelevantSubfield.value}'. No need to update 008/35-37`, debugDev);
         return [];
       }
       f008.value = `${f008.value.substr(0, 35)}smi${f008.value.substr(38)}`;
-      debug(` Update 008/35-37: '${currLang}' => 'smi'`);
+     nvdebug(` Update 008/35-37: '${currLang}' => 'smi'`, debugDev);
       return createReport([origValue], [f008.value]);
     }
 
@@ -99,7 +101,7 @@ export default function () {
         code: currSubfield.code,
         value: 'smi'
       };
-      debug(` f041: Add '\$${currSubfield.code} smi' before '${currSubfield.value}'`);
+     nvdebug(` f041: Add '\$${currSubfield.code} smi' before '${currSubfield.value}'`, debugDev);
 
       return processSubfields(otherSubfields, [...outgoingSubfields, smiSubfield, currSubfield]);
     }

package/src/indicator-fixes.js

@@ -1,10 +1,13 @@
 // Relocated from melinda-marc-record-merge-reducers (and renamed)
-//import createDebugLogger from 'debug';
-//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:normalizeIdentifiers');
 
-import {fieldToString} from './utils.js';
+import createDebugLogger from 'debug';
+import {fieldToString, nvdebug} from './utils.js';
 
 
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:indicator-fixes');
+const debugData = debug.extend('data');
+//const debugDev = debug.extend('dev');
+
 export default function () {
 
   return {
@@ -31,7 +34,7 @@ export default function () {
 
 
   function validateRecord(record, res) {
-    //nvdebug(record);
+    nvdebug(record, debugData);
     const clonedFields = JSON.parse(JSON.stringify(record.fields));
     recordNormalizeIndicators(record);
 
@@ -41,11 +44,11 @@ export default function () {
       const origFieldAsString = fieldToString(clonedFields[index]);
       //const clonedFieldAsString = fieldToString(field);
       if (clonedFields[index].ind1 !== field.ind1) {
-        //nvdebug(`FIX IND1: '${clonedFields[index].ind1}' => '${field.ind1}': ${clonedFieldAsString}`);
+        //nvdebug(`FIX IND1: '${clonedFields[index].ind1}' => '${field.ind1}': ${clonedFieldAsString}`, debugDev);
         res.message.push(`Expected IND1 for '${origFieldAsString}' is '${field.ind1}'`);
       }
       if (clonedFields[index].ind2 !== field.ind2) {
-        //nvdebug(`FIX IND2: '${clonedFields[index].ind2}' => '${field.ind2}': ${clonedFieldAsString}`);
+        //nvdebug(`FIX IND2: '${clonedFields[index].ind2}' => '${field.ind2}': ${clonedFieldAsString}`, debugDev);
         res.message.push(`Expected IND2 for '${origFieldAsString}' is '${field.ind2}'`);
       }
     }
@@ -79,7 +82,7 @@ function valueBeginsWithDeterminer(value, cands) {
 function determineNonFilingIndicatorValue(field, languages = undefined) {
   const subfieldA = field.subfields.find(sf => sf.code === 'a');
   if (!subfieldA) {
-    // nvdebug(' Subfield $a miss!');
+    // nvdebug(' Subfield $a miss!', debugDev);
     return;
   }