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

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-33X.test.js

@@ -22,7 +22,7 @@ generateTests({
 async function testValidatorFactory() {
   const validator = await validatorFactory();
 
-  assert.equal(typeof validator, 'objecr');
+  assert.equal(typeof validator, 'object');
   assert.equal(typeof validator.description, 'string');
   assert.equal(typeof validator.validate, 'function');
   assert.equal(typeof validator.fix, 'function');

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-country-codes.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './fix-country-codes.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/fix-country-codes:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fix-country-codes: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 = 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/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

@@ -0,0 +1,147 @@
+// Author(s): Nicholas Volk
+
+import createDebugLogger from 'debug';
+import clone from 'clone';
+
+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'];
+  const subfieldCodesUsingSmi = ['a', 'd'];
+
+  return {
+    description: 'Add corresponding \'smi\' subfield before a specific sami language subfields and update 008/35-37, if needed',
+    validate, fix
+  };
+
+  function getRelevantSubfieldCodes(record) { // Maybe this should be an exportable utility function...
+    if (record && record.leader && 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'];
+      }
+      return ['a'];
+    }
+
+    return ['a', 'd']; // Både-och
+  }
+
+
+  function fix(record, validateMode = false) {
+   nvdebug(`Start ${validateMode ? 'validator' : 'fixer'}`, debugDev);
+    const relevantSubfieldCodes = getRelevantSubfieldCodes(record);
+   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) {
+     nvdebug(` No relevant f041 fields found`, debugDev);
+      if (validateMode) {
+        return {message: [], valid: true};
+      }
+      return {message: [], fix: [], valid: true};
+    }
+
+    const relevantFieldsAsStrings = relevantFields.map(f => fieldToString(f)); // get original values
+
+    relevantFields.forEach(f => processField(f, relevantSubfieldCodes));
+    const modFieldsAsStrings = relevantFields.map(f => fieldToString(f));
+    const report = [...updateAndReport008(), ...createReport(relevantFieldsAsStrings, modFieldsAsStrings)];
+
+    if (validateMode) {
+      return {'message': report, 'valid': false};
+    }
+
+    return {message: [], fix: report, valid: true};
+
+    function updateAndReport008() { // Update 008/35-37 if necessary + report it
+      const [f008] = record.get('008').map(f => validateMode ? clone(f) : f);
+
+      if (!f008) {
+       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!
+       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') {
+        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)}`;
+     nvdebug(` Update 008/35-37: '${currLang}' => 'smi'`, debugDev);
+      return createReport([origValue], [f008.value]);
+    }
+
+    function processField(f) {
+      f.subfields = processSubfields(f.subfields, []);
+    }
+
+    function processSubfields(incomingSubfields, outgoingSubfields = []) {
+      const [currSubfield, ...otherSubfields] = incomingSubfields;
+      if (!currSubfield) {
+        return outgoingSubfields;
+      }
+      if (!isRelevantSamiSubfield(currSubfield, [...outgoingSubfields, ...otherSubfields])) {
+        return processSubfields(otherSubfields, [...outgoingSubfields, currSubfield]);
+      }
+
+      const smiSubfield = {
+        code: currSubfield.code,
+        value: 'smi'
+      };
+     nvdebug(` f041: Add '\$${currSubfield.code} smi' before '${currSubfield.value}'`, debugDev);
+
+      return processSubfields(otherSubfields, [...outgoingSubfields, smiSubfield, currSubfield]);
+    }
+
+    function isRelevantField(f) {
+      if (f.tag !== '041' || !f.subfields || f.subfields.some(sf => sf.code === '2')) {
+        return false;
+      }
+      return f.subfields.some(sf => isRelevantSamiSubfield(sf, f.subfields)); // it's ok to pass sf in f.subfields also
+    }
+
+    function isRelevantSamiSubfield(sf, otherSubfields) {
+      // NB! preceding 'smi' is added to all $a and $d fields, regardless of the LDR/06 value! (However, copying 041$a/d -> 008/35-37 depends on LDR/06)
+      if (!subfieldCodesUsingSmi.includes(sf.code) || !samiLanguages.includes(sf.value)) {
+        return false;
+      }
+      if (otherSubfields.some(sf2 => sf2.code === sf.code && sf2.value === 'smi')) { // fail if 'smi' already exists
+        return false;
+      }
+      //debug(` '\${sf.code} ${sf.value}' requires preceding 'smi'`);
+      return true;
+    }
+  }
+
+  function createReport(origArray, modArray) {
+    return origArray.map((entry, index) => createEntry(entry, index));
+
+    function createEntry(item, index) {
+      return `'${item}' => '${modArray[index]}'`;
+    }
+  }
+
+  function validate(record) {
+    return fix(record, true);
+  }
+
+
+
+
+
+
+}
+

package/src/fix-sami-041.test.js

@@ -0,0 +1,52 @@
+import assert from 'node:assert/strict';
+//import createDebugLogger from 'debug';
+
+import validatorFactory from './fix-sami-041.js';
+
+import {MarcRecord} from '@natlibfi/marc-record';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+
+generateTests({
+  callback,
+  path: [import.meta.dirname, '..', 'test-fixtures', 'fix-sami-041'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  hooks: {
+    before: async () => {
+      testValidatorFactory();
+    }
+  }
+});
+
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/drop-terms:test');
+
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+
+  assert.equal(typeof validator, 'object');
+  assert.equal(typeof validator.description, 'string');
+  assert.equal(typeof validator.validate, 'function');
+}
+
+async function callback({getFixture, fix = false}) {
+  const validator = await validatorFactory();
+  const record = new MarcRecord(getFixture('record.json'));
+  const expectedResult = getFixture('expectedResult.json');
+  //const expectedResult = new MarcRecord(getFixture('expectedResult.json'));
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    assert.deepEqual(result, expectedResult);
+    const originalRecord = new MarcRecord(getFixture('record.json'));
+    assert.deepEqual(record, originalRecord); // The record should now change in validation-only
+    return;
+  }
+
+  await validator.fix(record);
+  assert.deepEqual(record, new MarcRecord(expectedResult));
+}

package/src/fixRelatorTerms.js

@@ -69,6 +69,9 @@ export default () => (base, source) => {
 // https://wiki.helsinki.fi/display/MARC21svenska/Funktions-+och+relationskoder+-+alfabetiskt+efter+funktion
 // New, better source: https://id.kb.se/find?q=relator&_sort=_sortKeyByLang.en
 
+// NOTE: There are problematic relatorterms that do not diffrentiate between agent+work vs agent+ekspression relation
+// ie. teoksen haastattelija vs haastattelija (ekspressio)
+// current solution ignores them and handles just "plain" relator terms
 
 // NB! How to handle German sex-based Verfasser/Verfasserin pairs?
 const relatorTerms = [
@@ -80,6 +83,8 @@ const relatorTerms = [
   {'code': 'drt', 'eng': 'director', 'fin': 'ohjaaja', 'swe': 'regissör'},
   {'code': 'edt', 'eng': 'editor', 'fin': 'toimittaja', 'swe': 'redaktör'},
   {'code': 'ill', 'eng': 'illustrator', 'fin': 'kuvittaja', 'swe': 'illustratör'},
+  {'code': 'ive', 'eng': 'interviewee', 'fin': 'haastateltava', 'swe': 'intervjuobjekt'},
+  {'code': 'ivr', 'eng': 'interviewer', 'fin': 'haastattelija', 'swe': 'intervjuare'},
   {'code': 'lyr', 'eng': 'lyricist', 'fin': 'sanoittaja', 'swe': 'sångtext'},
   {'code': 'nrt', 'eng': 'narrator', 'fin': 'kertoja', 'swe': 'berättare'}, // berättare/inläsare
   {'code': 'pbl', 'eng': 'publisher', 'fin': 'julkaisija', 'swe': 'utgivare'},

package/src/fixRelatorTerms.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './fixRelatorTerms.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/fixRelatorTerms:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/fixRelatorTerms:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -30,12 +30,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/index.js

@@ -21,6 +21,7 @@ import Fix33X from './fix-33X.js';
 import FixCountryCodes from './fix-country-codes.js';
 import FixLanguageCodes from './fix-language-codes.js';
 import FixRelatorTerms from './fixRelatorTerms.js';
+import FixSami041 from './fix-sami-041.js';
 import FixedFields from './fixed-fields.js';
 import IdenticalFields from './identical-fields.js';
 import IndicatorFixes from './indicator-fixes.js';
@@ -39,6 +40,7 @@ import NormalizeUTF8Diacritics from './normalize-utf8-diacritics.js';
 import Punctuation from './punctuation/index.js';
 import Punctuation2 from './punctuation2.js';
 import ReindexSubfield6OccurenceNumbers from './reindexSubfield6OccurenceNumbers.js';
+import Remove041zxx from './remove-041-zxx.js';
 import RemoveDuplicateDataFields from './removeDuplicateDataFields.js';
 import RemoveInferiorDataFields from './removeInferiorDataFields.js';
 import ResolvableExtReferences from './resolvable-ext-references-melinda.js';
@@ -52,6 +54,7 @@ import SortTags from './sort-tags.js';
 import SubfieldValueNormalizations from './subfieldValueNormalizations.js';
 import SubfieldExclusion from './subfield-exclusion.js';
 import Sync007And300 from './sync-007-and-300.js';
+import SyncLanguage from './sync-language.js';
 import TranslateTerms from './translate-terms.js';
 import TypeOfDateF008 from './typeOfDate-008.js';
 import UnicodeDecomposition from './unicode-decomposition.js';
@@ -62,9 +65,9 @@ import {getCounterpart} from './merge-fields/counterpartField.js';
 
 import {postprocessRecords} from './merge-fields/mergeOrAddPostprocess.js';
 import {mergeField} from './merge-fields/mergeField.js';
-import {fieldGetOccurrenceNumberPairs, fieldGetUnambiguousOccurrenceNumber, fieldToNormalizedString, fieldsToNormalizedString, get6s,
-  isValidSubfield6, recordGetMaxSubfield6OccurrenceNumberAsInteger,
-  intToOccurrenceNumberString, resetSubfield6Tag, subfield6ResetOccurrenceNumber, subfield6GetOccurrenceNumber,
+import {fieldGetOccurrenceNumberPairs, fieldGetUnambiguousOccurrenceNumber, fieldHasValidSubfield6, fieldToNormalizedString, fieldsToNormalizedString, get6s,
+  isSubfield6Pair, isValidSubfield6, intToOccurrenceNumberString,
+  recordGetMaxSubfield6OccurrenceNumberAsInteger, resetSubfield6Tag, subfield6ResetOccurrenceNumber, subfield6GetOccurrenceNumber,
   subfield6GetOccurrenceNumberAsInteger} from './subfield6Utils.js';
 
 import {getSubfield8LinkingNumber, isValidSubfield8, recordGetAllSubfield8LinkingNumbers, recordGetFieldsWithSubfield8LinkingNumber} from './subfield8Utils.js';
@@ -72,14 +75,14 @@ import {getSubfield8LinkingNumber, isValidSubfield8, recordGetAllSubfield8Linkin
 import {recordFixRelatorTerms} from './fixRelatorTerms.js';
 import {fieldTrimSubfieldValues} from './normalizeFieldForComparison.js';
 import {baseHasEqualOrHigherEncodingLevel, deleteAllPrepublicationNotesFromField500InNonPubRecord, encodingLevelIsBetterThanPrepublication, getEncodingLevel, isEnnakkotietoField, isEnnakkotietoSubfield} from './prepublicationUtils.js';
-import {melindaFieldSpecs} from '@natlibfi/marc-record-validators-melinda/dist/melindaCustomMergeFields.js';
+import {melindaFieldSpecs} from './melindaCustomMergeFields.js';
 
 import {cloneAndRemovePunctuation} from './normalizeFieldForComparison.js';
 import {removeWorsePrepubField500s, removeWorsePrepubField594s} from './prepublicationUtils.js';
 import {fieldFixPunctuation} from './punctuation2.js';
 import {recordResetSubfield6OccurrenceNumbers} from './reindexSubfield6OccurenceNumbers.js';
 import {sortAdjacentSubfields} from './sortSubfields.js';
-import {fieldsToString} from './utils.js';
+import {fieldHasSubfield, fieldToString, fieldsToString, isContentSubfieldCode, tagIsRepeatable} from './utils.js';
 
 export {
   AccessRights,
@@ -105,11 +108,13 @@ export {
   FixCountryCodes,
   FixLanguageCodes,
   FixRelatorTerms,
+  FixSami041,
   FixedFields,
   IdenticalFields,
   IndicatorFixes,
   IsbnIssn,
   ItemLanguage,
+
   MergeField500Lisapainokset,
   MergeRelatorTermFields,
   Modernize502, //
@@ -123,6 +128,7 @@ export {
   Punctuation2,
   ResolveOrphanedSubfield6s, // Do this before reindexing! (thus I'm not sticking with alphabetical order here)
   ReindexSubfield6OccurenceNumbers,
+  Remove041zxx,
   RemoveDuplicateDataFields,
   RemoveInferiorDataFields,
   ResolvableExtReferences,
@@ -133,8 +139,9 @@ export {
   SubfieldExclusion,
   SubfieldValueNormalizations,
   Sync007And300,
-  TypeOfDateF008,
+  SyncLanguage,
   TranslateTerms,
+  TypeOfDateF008,
   UnicodeDecomposition,
   UpdateField540,
   Urn,
@@ -146,15 +153,19 @@ export {
   // 1. generic low level stuff
   getEncodingLevel,
 
-  // 2. text normalizations (eg. for similarity comparisons, field merge)
+  // 2. text normalizations + other generic utils (eg. for similarity comparisons, field merge)
   cloneAndRemovePunctuation,
   fieldFixPunctuation,
+  fieldHasSubfield,
   fieldToNormalizedString,
+  fieldToString,
   fieldTrimSubfieldValues,
   fieldsToNormalizedString,
   fieldsToString,
+  isContentSubfieldCode,
   recordFixRelatorTerms,
   sortAdjacentSubfields,
+  tagIsRepeatable,
 
   // 3. prepublication stuff
   baseHasEqualOrHigherEncodingLevel,
@@ -169,7 +180,9 @@ export {
   fieldGetOccurrenceNumberPairs,
   get6s,
   fieldGetUnambiguousOccurrenceNumber,
+  fieldHasValidSubfield6,
   intToOccurrenceNumberString,
+  isSubfield6Pair,
   isValidSubfield6,
   recordGetMaxSubfield6OccurrenceNumberAsInteger,
   recordResetSubfield6OccurrenceNumbers,

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;
   }
 
@@ -241,6 +244,17 @@ function getLanguages(record) {
 
 }
 
+function translated041Indicator1(field){
+  if (field.tag !== '041' || !field.subfields) {
+    return;
+  }
+  if (field.ind1 !== '1' && field.subfields.some(sf => ['h', 'k', 'm', 'n'].includes(sf.code))) {
+    field.ind1 = '1';
+    return;
+  }
+
+}
+
 function recordNormalizeIndicators(record) {
   recordNormalize490(record);
 
@@ -252,6 +266,7 @@ function recordNormalizeIndicators(record) {
 }
 
 function fieldNormalizeIndicators(field, record, languages) {
+  translated041Indicator1(field);
   normalize084Indicator1(field);
   normalize245Indicator1(field, record);
   noDisplayConstantGenerated520Indicator1(field);

package/src/indicator-fixes.test.js

@@ -3,7 +3,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './indicator-fixes.js';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+//import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -17,7 +17,7 @@ generateTests({
     before: () => testValidatorFactory()
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/indicator-fixes:test');
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/indicator-fixes:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -27,12 +27,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');