@natlibfi/marc-record-validators-melinda 12.0.0 → 12.0.1

package/src/sync-language.js

@@ -0,0 +1,148 @@
+// Author(s): Nicholas Volk
+
+//import createDebugLogger from 'debug';
+import clone from 'clone';
+
+import {fieldToString} from './utils.js';
+
+// const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sync-language');
+
+export default function () {
+
+  return {
+    description: 'Sync 008/35-37 and 041$a/$d',
+    validate, fix
+  };
+
+  function getSubfieldCodeFor041(record) {
+    const c = record?.leader[6];
+    if (c === 'i' || c === 'j') {
+      return 'd';
+    }
+    return 'a';
+  }
+
+  function transferableValue(val) {
+    if (val.match(/^[a-z]{3}$/u)) {
+      // 'zxx' is an exception to the otherwise relatively transitive 008/35-37 <=> 041$a relationship...
+      // https://wiki.helsinki.fi/xwiki/bin/view/rdasovellusohje/RDA-kuvailu%20MARC%2021%20-formaatilla/RDA-sovellusohje/008%20Kontrollikentt%C3%A4/#Hmp.35-37Kieli
+      // "008-kielikoodi on sama kuin ensimmäinen 041-kentän a- (tai d-) osakenttä. Poikkeuksen muodostaa koodi zxx:
+      //  jos tietueen 008ssa on kielikoodi zxx (ei kielellistä sisältöä, esim. soitinmusiikki), tietueessa ei voi olla 041 a- eikä d-osakenttää."
+      // So 'zxx' ain't transferable (done here), and it should be removed from 041 ($a and $d at least, not done here nor elsewhere at the moment...)
+      // Note that 'mul' and 'und' are treated (in this validator) the same as normal values.
+      if (val === 'zxx') {
+        return false;
+      }
+      return true;
+    }
+    return false;
+  }
+
+
+  function zxxRemoval041(record, field, validateMode) {
+    const fields041 = record.fields.filter(f => f.tag === '041');
+
+    return handleZxx(fields041);
+
+    function handleZxx(fields, result = []) {
+      const [currField, ...remainingFields] = fields;
+      if ( !currField) {
+        return result;
+      }
+      // Theoretically 'zxx' might mean something in ISO-639-3 or some other language code list:
+      if (!field.subfields || field.subfields.some(sf => sf.code === '2')) {
+        return handleZxx(remainingFields, result);
+      }
+      // Presumable 'zxx' is bad in any data subfield, not just 'a' and 'd':
+      const otherSubfields = field.subfields.some(sf => !sf.code.match(/^[a-z]$/u || sf.value !== 'zxx'));
+      if (otherSubfields.length === field.subfields.length) {
+        return handleZxx(remainingFields, result);
+      }
+      const originalString = fieldToString(field);
+      if (otherSubfields.length === 0) {
+        const message = `Remove '${originalString}'`;
+        if (!validateMode) {
+          record.removeField(field);
+        }
+        return handleZxx(remainingFields, [...result, message]);
+      }
+      // Some subfields are removed:
+      if (validateMode) {
+        // NB! In validation field is not really deleted, and the non-deleted field might trigger other fixes (than won't be done to a deleted field) later on
+        const clonedField = clone(field);
+        clonedField.subfields = otherSubfields;
+        const modifiedString = fieldToString(clonedField);
+        const message = `Modify '${originalString}' => '${modifiedString}`;
+        return handleZxx(remainingFields, [...result, message]);
+      }
+      field.subfields = otherSubfields;
+      const modifiedString = fieldToString(field);
+      const message = `Modify '${originalString}' => '${modifiedString}`;
+      return handleZxx(remainingFields, [...result, message]);
+    }
+
+
+  }
+
+  function sync008And041(record, validateMode) {
+    const f008 = record.fields.find(f => f.tag === '008');
+    const f041 = record.fields.find(f => f.tag === '041');
+
+    if (!f008 || f008.value.length !== 40) { // Some sanity checks
+      return [];
+    }
+
+    const subfieldCode = getSubfieldCodeFor041(record);
+    const lang008 = f008.value.substring(35, 38);
+
+    if (!f041) {
+      // Insert missing 041
+      if (transferableValue(lang008)) {
+        const newField = {'tag': '041', 'ind1': ' ', 'ind2': ' ', 'subfields': [ {'code': subfieldCode, 'value': lang008}]};
+        if (!validateMode) {
+          record.insertField(newField);
+        }
+        return [ `Add '${fieldToString(newField)}'` ];
+      }
+      // Can't do anything, and we only report this we can fix...
+      return [];
+    }
+
+    const firstRelevantSubfield = f041.subfields.find(sf => sf.code === subfieldCode);
+
+    // NB! If $2 is set, *never* copy it's value to 008/35-37... Otherwise we might a loop in Aleph.
+    // Note that if $2 is used, 008/35-37 should actually be '|||'. Now we just aggressively leave it alone.
+    if (!firstRelevantSubfield || !transferableValue(firstRelevantSubfield.value) || f041.subfields.some(sf => sf.code === '2') || lang008 === firstRelevantSubfield.value) {
+      return []
+    }
+
+    // Update 008/35-37:
+    const cloned008 = clone(f008);
+    cloned008.value = `${f008.value.substring(0, 35)}${firstRelevantSubfield.value}${f008.value.substring(38)}`;
+
+
+    if (!validateMode) {
+      f008.value = cloned008.value;
+    }
+    return [ `Modify '${f008.value}' to '${cloned008.value}'` ];
+  }
+
+  function fix(record, validateMode = false) {
+    const zxxMessages = zxxRemoval041(record, validateMode);
+
+    const syncMessages = sync008And041(record, validateMode);
+
+    const messages = [...zxxMessages, ...syncMessages];
+
+    if (validateMode) {
+       return {message: messages, valid: messages.length === 0};
+    }
+    return {message: [], fix: messages, valid: true};
+  }
+
+
+  function validate(record) {
+    return fix(record, true);
+  }
+}
+

package/src/sync-language.test.js

@@ -0,0 +1,52 @@
+import assert from 'node:assert/strict';
+//import createDebugLogger from 'debug';
+
+import validatorFactory from './sync-language.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', 'sync-language'],
+  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/translate-terms.js

@@ -60,8 +60,8 @@ 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);
 
@@ -79,6 +79,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]);
@@ -105,119 +106,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.
+
+    const data = await getTermData(uri);
+
+    if (!data) { // Sanity check. Miss caused by illegal id etc.
       nvdebug(`No labels found for ${uri}`, debug);
       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 +158,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 +169,7 @@ export default function () {
   }
 
 
-  function mapTagToLex(tag) {
-    if (tag === '655') {
-      return 'slm';
-    }
-    return 'yso';
-  }
+
 
 
   /*
@@ -269,3 +183,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})`);
+  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);
+    const subset = {
+      prefLabel: processLabel(hit?.prefLabel || undefined),
+      altLabel: processLabel(hit?.altLabel || undefined)
+    };
+    //console.log(`NEW JSON: ${JSON.stringify(hit)}`); // eslint-disable-line no-console
+
+    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/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.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');

package/test-fixtures/drop-terms/01/expectedResult.json

@@ -0,0 +1,31 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    { "tag": "001", "value": "test1"},
+    { "tag": "650", "ind1": " ", "ind2": "7", "subfields": [
+        { "code": "a", "value": "laiturit" },
+        { "code": "2", "value": "yso/fin" },
+        { "code": "0", "value": "http://www.yso.fi/onto/yso/p13299" }
+      ]
+    },
+
+    { "tag": "650", "ind1": " ", "ind2": "7", "subfields": [
+      { "code": "a", "value": "marxismi" },
+      { "code": "2", "value": "yso/fin" },
+      { "code": "0", "value": "http://www.yso.fi/onto/yso/p444" }
+    ]},
+    { "tag": "650", "ind1": " ", "ind2": "7", "subfields": [
+      { "code": "a", "value": "marxism" },
+      { "code": "2", "value": "yso/swe" },
+      { "code": "0", "value": "http://www.yso.fi/onto/yso/p444" }
+    ]},
+    { "tag": "651", "ind1": " ", "ind2": "7", "subfields": [
+      { "code": "a", "value": "Ivalo (Enare)" },
+      { "code": "2", "value": "yso/swe" },
+      { "code": "0", "value": "http://www.yso.fi/onto/yso/p111739" }
+    ]}
+
+
+  ],
+  "leader": ""
+}