@natlibfi/marc-record-validators-melinda 11.3.8 → 11.4.0-alpha.1

package/dist/translate-terms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"translate-terms.js","names":["_clone","_interopRequireDefault","require","_debug","_utils","e","__esModule","default","debug","createDebugLogger","defaultTags","swapLanguageCode","changeAbbrHash","termCache","_default","description","validate","fix","record","newFields","getFields","forEach","nf","nvdebug","fieldToString","insertField","newFieldsAsStrings","map","f","message","valid","length","messages","tags","fieldsToAdd","currTag","remainingTags","missingFields","deriveMissingFields","tmp","getPairlessFinnishAndSwedishFields","tag","expectedLex","mapTagToLex","fields","get","finnishFields","filter","isRelevantField","swedishFields","finnishOnly","getMisses","swedishOnly","tagAndFieldAgree","field","lexData","getLexiconAndLanguage","lex","pairlessFields","prefLabels","i","getPrefLabel","pairField","undefined","lexAndLang","twoLetterOtherLang","swapLanguageCodeBetweenLanguages","changeAbbr","lang","prefLabel","find","l","sfA","value","sf0","clone","subfields","sf","code","sf2","newField","ind1","ind2","subfield2","uri","fieldToUri","getTermData","subfieldA","pl","abbr","swaggerQuery","getTermDataFromFinto","headers","uri2","response","fetch","method","ok","json","graph","arr","hit","row","subfield0","id","replace","fieldAsString","match","lexLang","fieldHasSubfield","fieldHasValidSubfield0","fieldList1","fieldList2","hasSubfield0Match","pairFields","some"],"sources":["../src/translate-terms.js"],"sourcesContent":["import clone from 'clone';\nimport createDebugLogger from 'debug';\nimport {fieldHasSubfield, fieldToString, nvdebug} from './utils';\n\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortSubfields');\nconst defaultTags = ['648', '650', '651', '655'];\n\nconst swapLanguageCode = {'fin': 'swe', 'fi': 'sv', 'sv': 'fi', 'swe': 'fin'};\nconst changeAbbrHash = {'fi': 'fin', 'fin': 'fi', 'sv': 'swe', 'swe': 'sv'};\n\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-term');\nconst termCache = {};\n\n// Author(s): Nicholas Volk\nexport default function () {\n\n\n  return {\n    description: 'Translate yso (648, 650, 651) and slm (655) terms (FIN <=> SWE)',\n    validate, fix\n  };\n\n  async function fix(record) {\n    const newFields = await getFields(record, defaultTags, []);\n\n    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debug));\n\n    newFields.forEach(nf => record.insertField(nf));\n\n    const newFieldsAsStrings = newFields.map(f => fieldToString(f));\n\n\n    return {message: [], fix: newFieldsAsStrings, valid: true};\n  }\n\n  async function validate(record) {\n    const newFields = await getFields(record, defaultTags, []);\n    if (newFields.length === 0) {\n      return {'message': [], 'valid': true};\n    }\n    const messages = newFields.map(f => fieldToString(f));\n\n    return {'message': messages, 'valid': false};\n  }\n\n  async function getFields(record, tags, fieldsToAdd) {\n    const [currTag, ...remainingTags] = tags;\n    if (!currTag) {\n      return fieldsToAdd;\n    }\n    const missingFields = await deriveMissingFields(record, currTag);\n\n    const tmp = await getFields(record, remainingTags, [...fieldsToAdd, ...missingFields]);\n    return tmp;\n  }\n\n  function getPairlessFinnishAndSwedishFields(record, tag) {\n    const expectedLex = mapTagToLex(tag);\n    if (!expectedLex) {\n      return [];\n    }\n    const fields = record.get(tag);\n    const finnishFields = fields.filter(f => isRelevantField(f, 'fin'));\n    const swedishFields = fields.filter(f => isRelevantField(f, 'swe'));\n    const finnishOnly = getMisses(finnishFields, swedishFields);\n    const swedishOnly = getMisses(swedishFields, finnishFields);\n\n    //console.log(` Looking at ${finnishOnly.length} + ${swedishOnly.length} fields`); // eslint-disable-line no-console\n    return [...finnishOnly, ...swedishOnly].filter(f => tagAndFieldAgree(f));\n\n    function tagAndFieldAgree(field) {\n      // Check that tag and $2 value are pairable:\n      const lexData = getLexiconAndLanguage(field); // $2 data\n      return expectedLex === lexData.lex;\n    }\n  }\n\n  async function deriveMissingFields(record, tag) {\n    const pairlessFields = getPairlessFinnishAndSwedishFields(record, tag);\n\n    /* eslint-disable */\n    // 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...)\n    let prefLabels = [];\n    for (let i=0; i < pairlessFields.length; i += 1) {\n      prefLabels[i] = await getPrefLabel(pairlessFields[i]);\n    }\n    /* eslint-enable */\n\n    const missingFields = pairlessFields.map((f, i) => pairField(f, prefLabels[i]));\n    return missingFields.filter(f => f);\n  }\n\n  function pairField(field, prefLabels) {\n    if (!prefLabels) {\n      return undefined;\n    }\n    //console.log(`pairField() WP 1: ${fieldToString(field)}`); // eslint-disable-line no-console\n    const lexAndLang = getLexiconAndLanguage(field);\n    //console.log(`pairField() WP 2: ${JSON.stringify(lexAndLang)}`); // eslint-disable-line no-console\n    const twoLetterOtherLang = swapLanguageCodeBetweenLanguages(changeAbbr(lexAndLang.lang));\n    const prefLabel = prefLabels.find(l => l.lang === twoLetterOtherLang);\n    //console.log(`pairField() WP 4: ${JSON.stringify(prefLabel)}`); // eslint-disable-line no-console\n    const sfA = {'code': 'a', 'value': prefLabel.value}; // field.subfields.field(sf => sf.code === 'a');\n    const sf0 = clone(field.subfields.find(sf => sf.code === '0'));\n    const sf2 = {'code': '2', 'value': `${lexAndLang.lex}/${lexAndLang.lang === 'fin' ? 'swe' : 'fin'}`}; // swap fin <=> swe\n    const newField = {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [sfA, sf2, sf0]};\n    return newField;\n  }\n\n  function getLexiconAndLanguage(field) {\n    const subfield2 = field.subfields.find(sf => sf.code === '2');\n    if (subfield2.value === 'slm/fin') {\n      return {'lex': 'slm', 'lang': 'fin'};\n    }\n    if (subfield2.value === 'slm/swe') {\n      return {'lex': 'slm', 'lang': 'swe'};\n    }\n    if (subfield2.value === 'yso/fin') {\n      return {'lex': 'yso', 'lang': 'fin'};\n    }\n    if (subfield2.value === 'yso/swe') {\n      return {'lex': 'yso', 'lang': 'swe'};\n    }\n    return {};\n  }\n\n  async function getPrefLabel(field) {\n    // Tag vs $2 correlation has already been checked!\n    const uri = fieldToUri(field);\n    if (!uri) { // $0 is invalid or sumthing\n      return undefined;\n    }\n    const prefLabels = await getTermData(uri);\n    if (!prefLabels) { // Sanity check. Miss caused by illegal id etc.\n      nvdebug(`No labels found for ${uri}`, debug);\n      return undefined;\n    }\n    const lexData = getLexiconAndLanguage(field); // $2 data\n    const lang = changeAbbr(lexData.lang);\n\n\n    const subfieldA = field.subfields.find(sf => sf.code === 'a');\n\n    const prefLabel = prefLabels.find(pl => pl.lang === lang);\n    //console.info(`Compare prefLabel '${prefLabel.value}' AND $a '${subfieldA.value}'`); // eslint-disable-line no-console\n    if (prefLabel.value === subfieldA.value) {\n      nvdebug(`'${fieldToString(field)}' requires translating`, debug);\n      return prefLabels;\n    }\n    return undefined;\n  }\n\n  function swapLanguageCodeBetweenLanguages(code) {\n    if (swapLanguageCode[code]) {\n      return swapLanguageCode[code];\n    }\n    return code;\n  }\n\n  function changeAbbr(abbr) {\n    if (changeAbbrHash[abbr]) {\n      return changeAbbrHash[abbr];\n    }\n    return abbr;\n  }\n\n  function swaggerQuery(uri) {\n    // This would work for only yso, not yso-paikat etc `https://api.finto.fi/rest/v1/yso/data?format=application%2Fjson&uri=${uri}`;\n    return `https://api.finto.fi/rest/v1/data?uri=${uri}&format=application%2Fjson`; // This is simpler, but contains more irrelevant data\n  }\n\n  async function getTermData(uri) {\n    //console.log(`getTermData(${uri})`); // eslint-disable-line no-console\n    if (termCache[uri]) { // Don't think current implementation uses the cache any more.\n      //console.log(`CACHED ${uri}`); // eslint-disable-line no-console\n      return termCache[uri];\n    }\n    const tmp = await getTermDataFromFinto(uri);\n    termCache[uri] = tmp; // eslint-disable-line functional/immutable-data, require-atomic-updates\n    return tmp;\n  }\n\n  async function getTermDataFromFinto(uri) {\n    const headers = {'Accept': 'application/json'};\n    const uri2 = swaggerQuery(uri);\n\n    const response = await fetch(uri2, {method: 'GET', headers});\n    if (!response.ok) {\n      return undefined;\n    }\n    const json = await response.json();\n\n    if (!json.graph) {\n      return undefined;\n    }\n    const arr = json.graph;\n    const [hit] = arr.filter(row => row.uri === uri);\n    //console.log(`NEW JSON: ${JSON.stringify(hit.prefLabel)}`); // eslint-disable-line no-console\n    return hit.prefLabel;\n  }\n\n\n  function fieldToUri(field) {\n    const lex = mapTagToLex(field.tag);\n\n    const subfield0 = field.subfields.find(sf => sf.code === '0');\n    const id = subfield0.value.replace(/^[^0-9]+/u, '');\n    if (lex === 'yso') {\n      //return `http%3A%2F%2Fwww.yso.fi%2Fonto%2Fyso%2Fp${id}`;\n      return `http://www.yso.fi/onto/yso/p${id}`;\n    }\n    if (lex === 'slm') {\n      return `http://urn.fi/URN:NBN:fi:au:slm:s${id}`;\n    }\n    return undefined;\n  }\n\n  function isRelevantField(field, lang) {\n    const fieldAsString = fieldToString(field);\n\n    // We should probably allow an optional $8 as the first subfield.\n    if (!fieldAsString.match(/^... #7 ‡a [^‡]+ ‡2 [^‡]+ ‡0 [^‡]+(?: ‡9 [A-Z]+<(?:KEEP|DROP)>)*$/u)) {\n      return false;\n    }\n    const lex = mapTagToLex(field.tag);\n    const lexLang = `${lex}/${lang}`;\n    if (!fieldHasSubfield(field, '2', lexLang)) {\n      return false;\n    }\n    return fieldHasValidSubfield0(field);\n  }\n\n  function fieldHasValidSubfield0(field) {\n    const lex = mapTagToLex(field.tag);\n    const subfield0 = field.subfields.find(sf => sf.code === '0');\n    if (lex === 'yso' && subfield0.value.match(/^http:\\/\\/www\\.yso\\.fi\\/onto\\/yso\\/p[0-9]+$/u)) {\n      return true;\n    }\n    if (lex === 'slm' && subfield0.value.match(/^http:\\/\\/urn\\.fi\\/URN:NBN:fi:au:slm:s[0-9]+$/u)) {\n      return true;\n    }\n    return false;\n  }\n\n  function getMisses(fieldList1, fieldList2) {\n    return fieldList1.filter(f => !hasSubfield0Match(f, fieldList2));\n  }\n\n  function hasSubfield0Match(field, pairFields) {\n    const subfield0 = field.subfields.find(sf => sf.code === '0');\n    return pairFields.some(f => f.subfields.some(sf => sf.code === '0' && sf.value === subfield0.value));\n  }\n\n\n  function mapTagToLex(tag) {\n    if (tag === '655') {\n      return 'slm';\n    }\n    return 'yso';\n  }\n\n\n  /*\n  function getValidIdentifiers(record, tag, lang) {\n    const lex = mapTagToLex(tag);\n    const subfield2Value = `${lex}/${lang}`;\n    const candFields = record.get(tag).filter(f => f.subfields.some(sf => sf.code === '2' && sf.value === subfield2Value)); // TODO: filter\n    return [];\n  }\n    */\n\n}\n\n"],"mappings":"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","ignoreList":[]}

package/dist/translate-terms.spec.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var _chai = require("chai");
+var _marcRecord = require("@natlibfi/marc-record");
+var _translateTerms = _interopRequireDefault(require("./translate-terms"));
+var _fixura = require("@natlibfi/fixura");
+var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
+var _debug = _interopRequireDefault(require("debug"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'translate-terms'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: _fixura.READERS.JSON
+  },
+  mocha: {
+    before: () => testValidatorFactory()
+  }
+});
+const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda/translate-terms:test');
+async function testValidatorFactory() {
+  const validator = await (0, _translateTerms.default)();
+  (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
+  (0, _chai.expect)(validator.description).to.be.a('string');
+  (0, _chai.expect)(validator.validate).to.be.a('function');
+}
+async function callback({
+  getFixture,
+  enabled = true,
+  fix = false
+}) {
+  if (enabled === false) {
+    debug('TEST SKIPPED!');
+    return;
+  }
+  const validator = await (0, _translateTerms.default)();
+  const record = new _marcRecord.MarcRecord(getFixture('record.json'));
+  const expectedResult = getFixture('expectedResult.json');
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    (0, _chai.expect)(result).to.eql(expectedResult);
+    return;
+  }
+  await validator.fix(record);
+  (0, _chai.expect)(record).to.eql(expectedResult);
+}
+//# sourceMappingURL=translate-terms.spec.js.map

package/dist/translate-terms.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"translate-terms.spec.js","names":["_chai","require","_marcRecord","_translateTerms","_interopRequireDefault","_fixura","_fixugen","_debug","e","__esModule","default","generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","debug","createDebugLogger","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","enabled","fix","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/translate-terms.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './translate-terms';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'translate-terms'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-terms:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  expect(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  expect(validator.description).to.be.a('string');\n  expect(validator.validate).to.be.a('function');\n}\n\nasync function callback({getFixture, enabled = true, fix = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    expect(result).to.eql(expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  expect(record).to.eql(expectedResult);\n}\n"],"mappings":";;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAF,sBAAA,CAAAH,OAAA;AACA,IAAAM,MAAA,GAAAH,sBAAA,CAAAH,OAAA;AAAsC,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEtC,IAAAG,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,iBAAiB,CAAC;EAC3DC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAEA,CAAA,KAAMC,oBAAoB,CAAC;EACrC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,+DAA+D,CAAC;AAEhG,eAAeF,oBAAoBA,CAAA,EAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,uBAAgB,EAAC,CAAC;EAE1C,IAAAC,YAAM,EAACF,SAAS,CAAC,CACdG,EAAE,CAACC,EAAE,CAACC,EAAE,CAAC,QAAQ,CAAC,CAClBC,IAAI,CAACC,GAAG,CAACC,GAAG,CAACC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;EAE/C,IAAAP,YAAM,EAACF,SAAS,CAACU,WAAW,CAAC,CAACP,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,QAAQ,CAAC;EAC/C,IAAAT,YAAM,EAACF,SAAS,CAACY,QAAQ,CAAC,CAACT,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,UAAU,CAAC;AAChD;AAEA,eAAezB,QAAQA,CAAC;EAAC2B,UAAU;EAAEC,OAAO,GAAG,IAAI;EAAEC,GAAG,GAAG;AAAK,CAAC,EAAE;EACjE,IAAID,OAAO,KAAK,KAAK,EAAE;IACrBhB,KAAK,CAAC,eAAe,CAAC;IACtB;EACF;EAEA,MAAME,SAAS,GAAG,MAAM,IAAAC,uBAAgB,EAAC,CAAC;EAC1C,MAAMe,MAAM,GAAG,IAAIC,sBAAU,CAACJ,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMK,cAAc,GAAGL,UAAU,CAAC,qBAAqB,CAAC;EACxD;;EAEA,IAAI,CAACE,GAAG,EAAE;IACR,MAAMI,MAAM,GAAG,MAAMnB,SAAS,CAACY,QAAQ,CAACI,MAAM,CAAC;IAC/C,IAAAd,YAAM,EAACiB,MAAM,CAAC,CAAChB,EAAE,CAACiB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMlB,SAAS,CAACe,GAAG,CAACC,MAAM,CAAC;EAC3B,IAAAd,YAAM,EAACc,MAAM,CAAC,CAACb,EAAE,CAACiB,GAAG,CAACF,cAAc,CAAC;AACvC","ignoreList":[]}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "11.3.8",
+  "version": "11.4.0-alpha.1",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"

package/src/cyrillux.js

@@ -16,6 +16,7 @@ const cyrillicTrans = 'CYRILLIC <TRANS>';
 const sfs4900Trans = 'SFS4900 <TRANS>';
 
 export default function (config = {}) {
+  // console.log(`CONFIG=${JSON.stringify(config)}`); // eslint-disable-line no-console
 
   return {
     description: 'Cyrillux functionality: convert original field to latinitsa (ISO-9) and add 880s for original cyrillic and latinitsa (SFS-4900)',
@@ -23,15 +24,17 @@ export default function (config = {}) {
   };
 
   function preprocessConfig() {
+    config.retainCyrillic = typeof config.retainCyrillic === 'undefined' ? true : config.retainCyrillic; // eslint-disable-line functional/immutable-data
     config.doISO9Transliteration = typeof config.doISO9Transliteration === 'undefined' ? true : config.doISO9Transliteration; // eslint-disable-line functional/immutable-data
     config.doSFS4900Transliteration = typeof config.doSFS4900Transliteration === 'undefined' ? true : config.doSFS4900Transliteration; // eslint-disable-line functional/immutable-data
   }
 
   function fix(record) {
+    // console.log(`FIX has CONFIG=${JSON.stringify(config)}`); // eslint-disable-line no-console
     // Fix always succeeds
     const res = {message: [], fix: [], valid: true};
 
-    preprocessConfig(config);
+    preprocessConfig();
 
     const nBefore = record.fields.length;
 
@@ -61,7 +64,7 @@ export default function (config = {}) {
   function validate(record) {
     const res = {message: [], valid: true};
 
-    preprocessConfig(config);
+    preprocessConfig();
 
     record.fields?.forEach(field => {
       validateField(field, res, record);
@@ -150,22 +153,47 @@ export default function (config = {}) {
 
 
   function mapFieldToIso9(field, occurrenceNumber) {
-    // This is the original non-880 field, that will be converted from Cyrillic to ISO
-
+    if (!config.doISO9Transliteration) {
+      return undefined;
+    }
     // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either
-    if (!config.doISO9Transliteration && !config.doSFS4900Transliteration) {
+    if (!config.retainCyrillic && !config.doSFS4900Transliteration) {
       const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
       return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};
     }
 
     const subfield6 = deriveSubfield6('880', field.subfields, occurrenceNumber);
-    const subfield9 = fieldHasSubfield(field, '9', iso9Trans) ? [] : [{code: '9', value: iso9Trans}];
+    const subfield9 = fieldHasSubfield(field, '9', iso9Trans) ? [] : [{code: '9', value: iso9Trans}]; // Add only if needed
 
     const subfields = field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToIso9(sf));
 
     return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [subfield6, ...subfields, ...subfield9]};
   }
 
+  function mapFieldToSfs4900(field, occurrenceNumber, lang = 'rus') {
+    // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either
+    if (!config.retainCyrillic && !config.doISO9Transliteration) {
+      const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
+      return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};
+    }
+
+    const subfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
+    const subfield9 = fieldHasSubfield(field, '9', sfs4900Trans) ? [] : [{code: '9', value: sfs4900Trans}]; // Add only if needed
+
+    const subfields = field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToSfs4900(sf, lang));
+
+    const newField = {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [subfield6, ...subfields, ...subfield9]};
+
+    if (!config.doISO9Transliteration) {
+      return newField;
+    }
+
+    //const subfield6 = newField.subfields.find(sf => sf.code === '6');
+    newField.tag = '880'; // eslint-disable-line functional/immutable-data
+    resetSubfield6Tag(subfield6, field.tag);
+    return newField;
+  }
+
   function deriveSubfield6(tag, subfields, occurrenceNumber) {
     const initialSubfield = {code: '6', value: `${tag}-${occurrenceNumber}`};
     if (tag === '880') { // If *tag in subfield $6* is 880, field is not 880 :D
@@ -182,6 +210,9 @@ export default function (config = {}) {
   }
 
   function mapFieldToCyrillicField880(field, occurrenceNumber) {
+    if (!config.retainCyrillic) {
+      return undefined;
+    }
     nvdebug(`Derive CYR 880 from ${fieldToString(field)}`);
     const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
     const newSubfield9 = fieldHasSubfield(field, '9', cyrillicTrans) ? [] : [{code: '9', value: cyrillicTrans}];
@@ -196,21 +227,6 @@ export default function (config = {}) {
     return newField;
   }
 
-  function mapFieldToSfs4900Field880(field, occurrenceNumber, lang = 'rus') {
-    nvdebug(`Derive SFS 880 from ${fieldToString(field)}`);
-    const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
-    const newSubfield9 = fieldHasSubfield(field, '9', sfs4900Trans) ? [] : [{code: '9', value: sfs4900Trans}];
-    const subfields = [
-      newSubfield6,
-      ...field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToSfs4900(sf, lang)),
-      ...newSubfield9
-    ];
-
-    const newField = {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};
-    nvdebug(`       SFS 880      ${fieldToString(newField)}`);
-    return newField;
-  }
-
   function getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber = 0) {
     const occurrenceNumber = fieldGetMaxSubfield6OccurrenceNumberAsInteger(originalField);
     // Return existing occurrence number:
@@ -223,12 +239,12 @@ export default function (config = {}) {
     return recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;
   }
 
-  function needsIso9Transliteration(existingPairedFields) {
-    if (!config.doISO9Transliteration) {
+  function retainCyrillic(existingPairedFields) {
+    // Should we move cyrillic content from a normali field to a 880?
+    if (!config.retainCyrillic) {
       return false;
     }
-    // Actually normal field is always converted to ISO-9, and this function checks where we move original cyrillic field to 880.
-    // Thus we look for field 880$9 "CYRILLIC <TRANS>" here, and not "ISO9 <TRANS>"!
+    // Fail if we already have a paired 880 $9 <CYRILLIC> TRANS
     return !existingPairedFields.some(f => fieldHasSubfield(f, '9', cyrillicTrans));
   }
 
@@ -257,7 +273,12 @@ export default function (config = {}) {
 
     // Paired field: $9 CYRILLIC <TRANS> is the only legal <TRANS>
     const [pairedField] = existingPairedFields;
-    if (!fieldContainsCyrillicCharacters(pairedField) || pairedField.subfields.some(sf => sf.code === '9' && sf.value.includes('<TRANS>') && sf.value !== cyrillicTrans)) {
+    nvdebug(`LOOKING FOR SFS4900 PAIR: ${fieldToString(field)}`);
+    nvdebug(`     HAVING PAIRED FIELD: ${fieldToString(pairedField)}`);
+    if (!fieldContainsCyrillicCharacters(pairedField)) {
+      return false;
+    }
+    if (pairedField.subfields.some(sf => sf.code === '9' && sf.value.includes('<TRANS>') && sf.value !== cyrillicTrans)) {
       return false;
     }
 
@@ -265,7 +286,7 @@ export default function (config = {}) {
     // and thus it's a real case of MELINDA-10330 ISO9 adding:
     const occurrenceNumberAsString = fieldGetUnambiguousOccurrenceNumber(field);
     const languageCode = getLanguageCode(record);
-    const field2 = fieldToString(createFieldForSfs4900Comparison(mapFieldToSfs4900Field880(pairedField, occurrenceNumberAsString, languageCode), field.tag));
+    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'}`);
     return field1 === field2;
@@ -280,6 +301,9 @@ export default function (config = {}) {
 
   function transliterateSfs4900Pair(field, record) {
     // Handle MELINDA-10330: Field is already in SFS-4900 and the only paired field is in Cyrillic!
+    if (!config.doISO9Transliteration) {
+      return [];
+    }
     const [pairedField] = fieldGetOccurrenceNumberPairs(field, record.get('880'));
 
     const occurrenceNumberAsString = fieldGetUnambiguousOccurrenceNumber(field);
@@ -287,9 +311,9 @@ export default function (config = {}) {
 
     const tmpField = {'tag': field.tag, 'ind1': field.ind1, 'ind2': field.ind2, 'subfields': pairedField.subfields};
 
-    const newMainField = mapFieldToIso9(tmpField, occurrenceNumberAsString); // Cyrillic => ISO-9
-    const newCyrillicField = mapFieldToCyrillicField880(tmpField, occurrenceNumberAsString); // CYRILLIC
-    const newSFS4900Field = mapFieldToSfs4900Field880(field, occurrenceNumberAsString, languageCode); // SFS-4900
+    const newMainField = config.doISO9Transliteration ? mapFieldToIso9(tmpField, occurrenceNumberAsString) : undefined; // Cyrillic => ISO-9
+    const newCyrillicField = config.retainCyrillic ? mapFieldToCyrillicField880(tmpField, occurrenceNumberAsString) : undefined; // CYRILLIC
+    const newSFS4900Field = config.doSFS4900Transliteration ? mapFieldToSfs4900(field, occurrenceNumberAsString, languageCode) : undefined; // SFS-4900
 
     // Trigger the drop of original counterpart $6 :
     pairedField.cyrilluxSkip = 1; // eslint-disable-line functional/immutable-data
@@ -322,8 +346,8 @@ export default function (config = {}) {
     // nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`);
 
     const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9
-    const newCyrillicField = needsIso9Transliteration(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC
-    const newSFS4900Field = needsSfs4900Transliteration(existingPairedFields) ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString, languageCode) : undefined; /// SFS-4900
+    const newCyrillicField = retainCyrillic(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC
+    const newSFS4900Field = needsSfs4900Transliteration(existingPairedFields) ? mapFieldToSfs4900(originalField, newOccurrenceNumberAsString, languageCode) : undefined; /// SFS-4900
 
     return [newMainField, newCyrillicField, newSFS4900Field].filter(f => f);
   }

package/src/translate-terms.js

@@ -0,0 +1,274 @@
+import clone from 'clone';
+import createDebugLogger from 'debug';
+import {fieldHasSubfield, fieldToString, nvdebug} from './utils';
+
+
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortSubfields');
+const defaultTags = ['648', '650', '651', '655'];
+
+const swapLanguageCode = {'fin': 'swe', 'fi': 'sv', 'sv': 'fi', 'swe': 'fin'};
+const changeAbbrHash = {'fi': 'fin', 'fin': 'fi', 'sv': 'swe', 'swe': 'sv'};
+
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-term');
+const termCache = {};
+
+// Author(s): Nicholas Volk
+export default function () {
+
+
+  return {
+    description: 'Translate yso (648, 650, 651) and slm (655) terms (FIN <=> SWE)',
+    validate, fix
+  };
+
+  async function fix(record) {
+    const newFields = await getFields(record, defaultTags, []);
+
+    newFields.forEach(nf => nvdebug(`Add new field '${fieldToString(nf)}'`, debug));
+
+    newFields.forEach(nf => record.insertField(nf));
+
+    const newFieldsAsStrings = newFields.map(f => fieldToString(f));
+
+
+    return {message: [], fix: newFieldsAsStrings, valid: true};
+  }
+
+  async function validate(record) {
+    const newFields = await getFields(record, defaultTags, []);
+    if (newFields.length === 0) {
+      return {'message': [], 'valid': true};
+    }
+    const messages = newFields.map(f => fieldToString(f));
+
+    return {'message': messages, 'valid': false};
+  }
+
+  async function getFields(record, tags, fieldsToAdd) {
+    const [currTag, ...remainingTags] = tags;
+    if (!currTag) {
+      return fieldsToAdd;
+    }
+    const missingFields = await deriveMissingFields(record, currTag);
+
+    const tmp = await getFields(record, remainingTags, [...fieldsToAdd, ...missingFields]);
+    return tmp;
+  }
+
+  function getPairlessFinnishAndSwedishFields(record, tag) {
+    const expectedLex = mapTagToLex(tag);
+    if (!expectedLex) {
+      return [];
+    }
+    const fields = record.get(tag);
+    const finnishFields = fields.filter(f => isRelevantField(f, 'fin'));
+    const swedishFields = fields.filter(f => isRelevantField(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
+    return [...finnishOnly, ...swedishOnly].filter(f => tagAndFieldAgree(f));
+
+    function tagAndFieldAgree(field) {
+      // Check that tag and $2 value are pairable:
+      const lexData = getLexiconAndLanguage(field); // $2 data
+      return expectedLex === lexData.lex;
+    }
+  }
+
+  async function deriveMissingFields(record, tag) {
+    const pairlessFields = getPairlessFinnishAndSwedishFields(record, tag);
+
+    /* eslint-disable */
+    // 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...)
+    let prefLabels = [];
+    for (let i=0; i < pairlessFields.length; i += 1) {
+      prefLabels[i] = await getPrefLabel(pairlessFields[i]);
+    }
+    /* eslint-enable */
+
+    const missingFields = pairlessFields.map((f, i) => pairField(f, prefLabels[i]));
+    return missingFields.filter(f => f);
+  }
+
+  function pairField(field, prefLabels) {
+    if (!prefLabels) {
+      return undefined;
+    }
+    //console.log(`pairField() WP 1: ${fieldToString(field)}`); // eslint-disable-line no-console
+    const lexAndLang = getLexiconAndLanguage(field);
+    //console.log(`pairField() WP 2: ${JSON.stringify(lexAndLang)}`); // eslint-disable-line no-console
+    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
+    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
+    const newField = {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [sfA, sf2, sf0]};
+    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!
+    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);
+      return undefined;
+    }
+    const lexData = getLexiconAndLanguage(field); // $2 data
+    const lang = changeAbbr(lexData.lang);
+
+
+    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);
+      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; // eslint-disable-line functional/immutable-data, require-atomic-updates
+    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;
+  }
+
+  function isRelevantField(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)) {
+      return false;
+    }
+    const lex = mapTagToLex(field.tag);
+    const lexLang = `${lex}/${lang}`;
+    if (!fieldHasSubfield(field, '2', lexLang)) {
+      return false;
+    }
+    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));
+  }
+
+  function hasSubfield0Match(field, pairFields) {
+    const subfield0 = field.subfields.find(sf => sf.code === '0');
+    return pairFields.some(f => f.subfields.some(sf => sf.code === '0' && sf.value === subfield0.value));
+  }
+
+
+  function mapTagToLex(tag) {
+    if (tag === '655') {
+      return 'slm';
+    }
+    return 'yso';
+  }
+
+
+  /*
+  function getValidIdentifiers(record, tag, lang) {
+    const lex = mapTagToLex(tag);
+    const subfield2Value = `${lex}/${lang}`;
+    const candFields = record.get(tag).filter(f => f.subfields.some(sf => sf.code === '2' && sf.value === subfield2Value)); // TODO: filter
+    return [];
+  }
+    */
+
+}
+

package/src/translate-terms.spec.js

@@ -0,0 +1,52 @@
+import {expect} from 'chai';
+import {MarcRecord} from '@natlibfi/marc-record';
+import validatorFactory from './translate-terms';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+import createDebugLogger from 'debug';
+
+generateTests({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'translate-terms'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  mocha: {
+    before: () => testValidatorFactory()
+  }
+});
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/translate-terms:test');
+
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+
+  expect(validator)
+    .to.be.an('object')
+    .that.has.any.keys('description', 'validate');
+
+  expect(validator.description).to.be.a('string');
+  expect(validator.validate).to.be.a('function');
+}
+
+async function callback({getFixture, enabled = true, fix = false}) {
+  if (enabled === false) {
+    debug('TEST SKIPPED!');
+    return;
+  }
+
+  const validator = await validatorFactory();
+  const record = new MarcRecord(getFixture('record.json'));
+  const expectedResult = getFixture('expectedResult.json');
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    expect(result).to.eql(expectedResult);
+    return;
+  }
+
+  await validator.fix(record);
+  expect(record).to.eql(expectedResult);
+}

package/test-fixtures/cyrillux/f01/metadata.json

@@ -1,5 +1,5 @@
 {
-  "description": "Fix: field 100 required translitteration",
+  "description": "01 Fix: field 100 required translitteration",
   "only": false,
   "fix": true
 }