@natlibfi/marc-record-validators-melinda 11.3.3 → 11.3.4-alpha

package/dist/cyrillux.js

@@ -17,6 +17,9 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //import createDebugLogger from 'debug';
 
+const iso9Trans = 'ISO9 <TRANS>';
+const cyrillicTrans = 'CYRILLIC <TRANS>';
+const sfs4900Trans = 'SFS4900 <TRANS>';
 function _default(config = {}) {
   return {
     description: 'Cyrillux functionality: convert original field to latinitsa (ISO-9) and add 880s for original cyrillic and latinitsa (SFS-4900)',
@@ -100,19 +103,32 @@ function _default(config = {}) {
     }
     return containsCyrillicCharacters(subfield.value);
   }
-  function fieldShouldTransliterateToIso9(field) {
-    // Skip certain tags ('880' is the actual skip-me beef here, but we have seen other no-nos as well)
+  function fieldCanBeTransliterated(field) {
+    // Skip certain tags ('880' is the actual skip-me beef here, but we have seen other no-nos as well).
+    // Discussion: We should probably also skip others like 05X-08X, 648, 650, 651, and 655, but this needs thinking...
+    // Also I'd like to co CYRILLIC->ISO-9 for field 300 (and others?) without 880 mappings...
     if (['336', '337', '338', '880'].includes(field.tag)) {
       return false;
     }
-    // Skip control fields and fields that already have a translitteration
-    if (!field.subfields || field.subfields.some(sf => sf.code === '6')) {
+    // Skip control fields:
+    if (!field.subfields) {
       return false;
     }
-    return fieldContainsCyrillicCharacters(field);
+    // MELINDA-10330: $6 should not prevent translittaration per se, so this restriction is no longer applied!
+
+    if (field.subfields.some(sf => sf.code === '9' && sf.value.includes('<TRANS>'))) {
+      return false;
+    }
+    return fieldContainsCyrillicCharacters(field); // We have something to translitterate:
   }
   function mapSubfieldToIso9(subfield) {
-    const value = subfieldShouldTransliterateToIso9(subfield) ? iso9.convertToLatin(subfield.value) : subfield.value;
+    if (!subfieldShouldTransliterateToIso9(subfield)) {
+      return {
+        code: subfield.code,
+        value: subfield.code
+      }; // just clone
+    }
+    const value = iso9.convertToLatin(subfield.value);
     return {
       code: subfield.code,
       value
@@ -126,17 +142,11 @@ function _default(config = {}) {
     };
   }
   function mapFieldToIso9(field, occurrenceNumber) {
-    const subfield6 = {
-      code: '6',
-      value: `880-${occurrenceNumber}`
-    };
-    const subfield9 = {
-      code: '9',
-      value: 'ISO9 <TRANS>'
-    };
-    const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
+    // This is the original non-880 field, that will be converted from Cyrillic to ISO
+
+    // 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) {
-      // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either
+      const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
       return {
         tag: field.tag,
         ind1: field.ind1,
@@ -144,52 +154,108 @@ function _default(config = {}) {
         subfields
       };
     }
+    const subfield6 = deriveSubfield6('880', field.subfields, occurrenceNumber);
+    const subfield9 = (0, _utils.fieldHasSubfield)(field, '9', iso9Trans) ? [] : [{
+      code: '9',
+      value: iso9Trans
+    }];
+    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]
+      subfields: [subfield6, ...subfields, ...subfield9]
     };
   }
-  function mapFieldToCyrillicField880(field, occurrenceNumber) {
-    const subfields = [{
+  function deriveSubfield6(tag, subfields, occurrenceNumber) {
+    const initialSubfield = {
       code: '6',
-      value: `${field.tag}-${occurrenceNumber}`
-    }, ...field.subfields.map(sf => (0, _clone.default)(sf)), {
+      value: `${tag}-${occurrenceNumber}`
+    };
+    if (tag === '880') {
+      // If *tag in subfield $6* is 880, field is not 880 :D
+      return initialSubfield;
+    }
+    // Try to use existing subfield
+    const [subfield6] = subfields.filter(sf => sf.code === '6').map(sf => (0, _clone.default)(sf));
+    if (subfield6) {
+      (0, _subfield6Utils.resetSubfield6Tag)(subfield6, tag); // Should we update occurrence number?
+      return subfield6;
+    }
+    return initialSubfield;
+  }
+  function mapFieldToCyrillicField880(field, occurrenceNumber) {
+    (0, _utils.nvdebug)(`Derive CYR 880 from ${(0, _utils.fieldToString)(field)}`);
+    const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
+    const newSubfield9 = (0, _utils.fieldHasSubfield)(field, '9', cyrillicTrans) ? [] : [{
       code: '9',
-      value: 'CYRILLIC <TRANS>'
+      value: cyrillicTrans
     }];
-    return {
+    const subfields = [newSubfield6, ...field.subfields.filter(sf => sf.code !== '6').map(sf => (0, _clone.default)(sf)), ...newSubfield9];
+    const newField = {
       tag: '880',
       ind1: field.ind1,
       ind2: field.ind2,
       subfields
     };
+    (0, _utils.nvdebug)(`       CYR 880      ${(0, _utils.fieldToString)(newField)}`);
+    return newField;
   }
   function mapFieldToSfs4900Field880(field, occurrenceNumber) {
-    const subfields = [{
-      code: '6',
-      value: `${field.tag}-${occurrenceNumber}`
-    }, ...field.subfields.map(sf => mapSubfieldToSfs4900(sf)), {
+    (0, _utils.nvdebug)(`Derive SFS 880 from ${(0, _utils.fieldToString)(field)}`);
+    const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);
+    const newSubfield9 = (0, _utils.fieldHasSubfield)(field, '9', sfs4900Trans) ? [] : [{
       code: '9',
-      value: 'SFS4900 <TRANS>'
+      value: sfs4900Trans
     }];
-    return {
+    const subfields = [newSubfield6, ...field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToSfs4900(sf)), ...newSubfield9];
+    const newField = {
       tag: '880',
       ind1: field.ind1,
       ind2: field.ind2,
       subfields
     };
+    (0, _utils.nvdebug)(`       SFS 880      ${(0, _utils.fieldToString)(newField)}`);
+    return newField;
+  }
+  function getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber = 0) {
+    const occurrenceNumber = (0, _subfield6Utils.fieldGetMaxSubfield6OccurrenceNumberAsInteger)(originalField);
+    // Return existing occurrence number:
+    if (occurrenceNumber > 0) {
+      return occurrenceNumber;
+    }
+    if (maxCreatedOccurrenceNumber) {
+      return maxCreatedOccurrenceNumber + 1;
+    }
+    return (0, _subfield6Utils.recordGetMaxSubfield6OccurrenceNumberAsInteger)(record) + 1;
+  }
+  function needsIso9Transliteration(existingPairedFields) {
+    if (!config.doISO9Transliteration) {
+      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>"!
+    return !existingPairedFields.some(f => (0, _utils.fieldHasSubfield)(f, '9', cyrillicTrans));
+  }
+  function needsSfs4900Transliteration(existingPairedFields) {
+    if (!config.doSFS4900Transliteration) {
+      return false;
+    }
+    return !existingPairedFields.some(f => (0, _utils.fieldHasSubfield)(f, '9', sfs4900Trans));
   }
   function processField(originalField, record, maxCreatedOccurrenceNumber = 0) {
-    if (!fieldShouldTransliterateToIso9(originalField)) {
+    if (!fieldCanBeTransliterated(originalField)) {
       return [originalField];
     }
-    const newOccurrenceNumberAsInt = maxCreatedOccurrenceNumber ? maxCreatedOccurrenceNumber + 1 : (0, _subfield6Utils.recordGetMaxSubfield6OccurrenceNumberAsInteger)(record) + 1;
+    (0, _utils.nvdebug)(`PROCESSING: ${(0, _utils.fieldToString)(originalField)}`);
+    const newOccurrenceNumberAsInt = getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber);
     const newOccurrenceNumberAsString = (0, _subfield6Utils.intToOccurrenceNumberString)(newOccurrenceNumberAsInt);
+    (0, _utils.nvdebug)(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`);
+    const existingPairedFields = (0, _subfield6Utils.fieldGetOccurrenceNumberPairs)(originalField, record.get('880'));
+    (0, _utils.nvdebug)(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`);
     const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9
-    const newCyrillicField = config.doISO9Transliteration ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC
-    const newSFS4900Field = config.doSFS4900Transliteration ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString) : undefined; /// SFS-4900
+    const newCyrillicField = needsIso9Transliteration(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC
+    const newSFS4900Field = needsSfs4900Transliteration(existingPairedFields) ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString) : undefined; /// SFS-4900
 
     return [newMainField, newCyrillicField, newSFS4900Field].filter(f => f);
   }

package/dist/cyrillux.js.map

@@ -1 +1 @@
-{"version":3,"file":"cyrillux.js","names":["_clone","_interopRequireDefault","require","_utils","iso9","_interopRequireWildcard","_subfield6Utils","_xregexp","sfs4900","_sortFields","_reindexSubfield6OccurenceNumbers","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_default","config","description","validate","fix","preprocessConfig","doISO9Transliteration","doSFS4900Transliteration","record","res","message","valid","nBefore","fields","length","processFields","reindexSubfield6OccurenceNumbers","sortFields","input","output","currField","remainingInput","fakeRecord","createdMax","recordGetMaxSubfield6OccurrenceNumberAsInteger","result","processField","forEach","field","validateField","orig","fieldToString","normalizedFields","clone","mod","fieldsToString","replace","push","isCyrillicCharacter","char","XRegExp","test","containsCyrillicCharacters","str","split","some","fieldContainsCyrillicCharacters","subfields","sf","subfieldShouldTransliterateToIso9","subfield","isControlSubfieldCode","code","value","fieldShouldTransliterateToIso9","includes","tag","mapSubfieldToIso9","convertToLatin","mapSubfieldToSfs4900","mapFieldToIso9","occurrenceNumber","subfield6","subfield9","map","ind1","ind2","mapFieldToCyrillicField880","mapFieldToSfs4900Field880","originalField","maxCreatedOccurrenceNumber","newOccurrenceNumberAsInt","newOccurrenceNumberAsString","intToOccurrenceNumberString","newMainField","newCyrillicField","undefined","newSFS4900Field","filter","f"],"sources":["../src/cyrillux.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldToString, fieldsToString, isControlSubfieldCode} from './utils';\nimport * as iso9 from 'iso9_1995';\nimport {intToOccurrenceNumberString, recordGetMaxSubfield6OccurrenceNumberAsInteger} from './subfield6Utils';\n\nimport XRegExp from 'xregexp';\nimport * as sfs4900 from 'sfs4900';\nimport {default as sortFields} from './sortFields';\nimport {default as reindexSubfield6OccurenceNumbers} from './reindexSubfield6OccurenceNumbers';\n\nexport default function (config = {}) {\n\n  return {\n    description: 'Cyrillux functionality: convert original field to latinitsa (ISO-9) and add 880s for original cyrillic and latinitsa (SFS-4900)',\n    validate, fix\n  };\n\n  function preprocessConfig() {\n    config.doISO9Transliteration = typeof config.doISO9Transliteration === 'undefined' ? true : config.doISO9Transliteration; // eslint-disable-line functional/immutable-data\n    config.doSFS4900Transliteration = typeof config.doSFS4900Transliteration === 'undefined' ? true : config.doSFS4900Transliteration; // eslint-disable-line functional/immutable-data\n  }\n\n  function fix(record) {\n    // Fix always succeeds\n    const res = {message: [], fix: [], valid: true};\n\n    preprocessConfig(config);\n\n    const nBefore = record.fields.length;\n\n    record.fields = processFields(record.fields); // eslint-disable-line functional/immutable-data\n\n    if (nBefore < record.fields.length) { // eslint-disable-line functional/no-conditional-statements\n      reindexSubfield6OccurenceNumbers().fix(record);\n      sortFields().fix(record);\n    }\n\n    function processFields(input, output = []) {\n      const [currField, ...remainingInput] = input;\n      if (!currField) {\n        return output;\n      }\n\n      const fakeRecord = {fields: output};\n      const createdMax = recordGetMaxSubfield6OccurrenceNumberAsInteger(fakeRecord);\n      const result = processField(currField, record, createdMax);\n\n      return processFields(remainingInput, [...output, ...result]);\n    }\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: [], valid: true};\n\n    preprocessConfig(config);\n\n    record.fields?.forEach(field => {\n      validateField(field, res, record);\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n\n  function validateField(field, res, record) {\n    const orig = fieldToString(field);\n\n    const normalizedFields = processField(clone(field), record);\n    const mod = fieldsToString(normalizedFields).replace(/\\t__SEPARATOR__\\t/ug, ', ').replace(/ (‡6 [0-9][0-9][0-9])-[0-9][0-9]+/gu, ' $1-NN'); // eslint-disable-line prefer-named-capture-group\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`CHANGE: ${orig} => ${mod}`); // eslint-disable-line functional/immutable-data\n      return;\n    }\n    return;\n  }\n\n  function isCyrillicCharacter(char) {\n    return XRegExp('[\\\\p{Cyrillic}]').test(char); // eslint-disable-line new-cap\n  }\n\n  function containsCyrillicCharacters(str) { // from melinda-ui-cyrillux\n    if (!str) {\n      return false;\n    }\n    return str.split('').some(isCyrillicCharacter);\n  }\n\n  function fieldContainsCyrillicCharacters(field) { // based on melinda-ui-cyrillux\n    return field.subfields && field.subfields.some(sf => subfieldShouldTransliterateToIso9(sf));\n  }\n\n  function subfieldShouldTransliterateToIso9(subfield) {\n    if (isControlSubfieldCode(subfield.code)) {\n      return false;\n    }\n    return containsCyrillicCharacters(subfield.value);\n  }\n\n  function fieldShouldTransliterateToIso9(field) {\n    // Skip certain tags ('880' is the actual skip-me beef here, but we have seen other no-nos as well)\n    if (['336', '337', '338', '880'].includes(field.tag)) {\n      return false;\n    }\n    // Skip control fields and fields that already have a translitteration\n    if (!field.subfields || field.subfields.some(sf => sf.code === '6')) {\n      return false;\n    }\n    return fieldContainsCyrillicCharacters(field);\n  }\n\n  function mapSubfieldToIso9(subfield) {\n    const value = subfieldShouldTransliterateToIso9(subfield) ? iso9.convertToLatin(subfield.value) : subfield.value;\n    return {code: subfield.code, value};\n  }\n\n  function mapSubfieldToSfs4900(subfield) {\n    const value = subfieldShouldTransliterateToIso9(subfield) ? sfs4900.convertToLatin(subfield.value).result : subfield.value;\n    return {code: subfield.code, value};\n  }\n\n\n  function mapFieldToIso9(field, occurrenceNumber) {\n    const subfield6 = {code: '6', value: `880-${occurrenceNumber}`};\n    const subfield9 = {code: '9', value: 'ISO9 <TRANS>'};\n\n    const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));\n\n    if (!config.doISO9Transliteration && !config.doSFS4900Transliteration) {\n      // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either\n      return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};\n    }\n\n    return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [subfield6, ...subfields, subfield9]};\n  }\n\n  function mapFieldToCyrillicField880(field, occurrenceNumber) {\n    const subfields = [\n      {code: '6', value: `${field.tag}-${occurrenceNumber}`},\n      ...field.subfields.map(sf => clone(sf)),\n      {code: '9', value: 'CYRILLIC <TRANS>'}\n    ];\n\n    return {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};\n  }\n\n  function mapFieldToSfs4900Field880(field, occurrenceNumber) {\n\n    const subfields = [\n      {code: '6', value: `${field.tag}-${occurrenceNumber}`},\n      ...field.subfields.map(sf => mapSubfieldToSfs4900(sf)),\n      {code: '9', value: 'SFS4900 <TRANS>'}\n    ];\n\n    return {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};\n  }\n\n  function processField(originalField, record, maxCreatedOccurrenceNumber = 0) {\n    if (!fieldShouldTransliterateToIso9(originalField)) {\n      return [originalField];\n    }\n    const newOccurrenceNumberAsInt = maxCreatedOccurrenceNumber ? maxCreatedOccurrenceNumber + 1 : recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;\n    const newOccurrenceNumberAsString = intToOccurrenceNumberString(newOccurrenceNumberAsInt);\n\n    const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9\n    const newCyrillicField = config.doISO9Transliteration ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC\n    const newSFS4900Field = config.doSFS4900Transliteration ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString) : undefined; /// SFS-4900\n\n    return [newMainField, newCyrillicField, newSFS4900Field].filter(f => f);\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"cyrillux.js","names":["_clone","_interopRequireDefault","require","_utils","iso9","_interopRequireWildcard","_subfield6Utils","_xregexp","sfs4900","_sortFields","_reindexSubfield6OccurenceNumbers","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","iso9Trans","cyrillicTrans","sfs4900Trans","_default","config","description","validate","fix","preprocessConfig","doISO9Transliteration","doSFS4900Transliteration","record","res","message","valid","nBefore","fields","length","processFields","reindexSubfield6OccurenceNumbers","sortFields","input","output","currField","remainingInput","fakeRecord","createdMax","recordGetMaxSubfield6OccurrenceNumberAsInteger","result","processField","forEach","field","validateField","orig","fieldToString","normalizedFields","clone","mod","fieldsToString","replace","push","isCyrillicCharacter","char","XRegExp","test","containsCyrillicCharacters","str","split","some","fieldContainsCyrillicCharacters","subfields","sf","subfieldShouldTransliterateToIso9","subfield","isControlSubfieldCode","code","value","fieldCanBeTransliterated","includes","tag","mapSubfieldToIso9","convertToLatin","mapSubfieldToSfs4900","mapFieldToIso9","occurrenceNumber","map","ind1","ind2","subfield6","deriveSubfield6","subfield9","fieldHasSubfield","filter","initialSubfield","resetSubfield6Tag","mapFieldToCyrillicField880","nvdebug","newSubfield6","newSubfield9","newField","mapFieldToSfs4900Field880","getNewOccurrenceNumber","originalField","maxCreatedOccurrenceNumber","fieldGetMaxSubfield6OccurrenceNumberAsInteger","needsIso9Transliteration","existingPairedFields","f","needsSfs4900Transliteration","newOccurrenceNumberAsInt","newOccurrenceNumberAsString","intToOccurrenceNumberString","fieldGetOccurrenceNumberPairs","newMainField","newCyrillicField","undefined","newSFS4900Field"],"sources":["../src/cyrillux.js"],"sourcesContent":["//import createDebugLogger from 'debug';\nimport clone from 'clone';\nimport {fieldHasSubfield, fieldToString, fieldsToString, isControlSubfieldCode, nvdebug} from './utils';\nimport * as iso9 from 'iso9_1995';\nimport {fieldGetMaxSubfield6OccurrenceNumberAsInteger, fieldGetOccurrenceNumberPairs, intToOccurrenceNumberString, recordGetMaxSubfield6OccurrenceNumberAsInteger, resetSubfield6Tag} from './subfield6Utils';\n\nimport XRegExp from 'xregexp';\nimport * as sfs4900 from 'sfs4900';\nimport {default as sortFields} from './sortFields';\nimport {default as reindexSubfield6OccurenceNumbers} from './reindexSubfield6OccurenceNumbers';\n\nconst iso9Trans = 'ISO9 <TRANS>';\nconst cyrillicTrans = 'CYRILLIC <TRANS>';\nconst sfs4900Trans = 'SFS4900 <TRANS>';\n\nexport default function (config = {}) {\n\n  return {\n    description: 'Cyrillux functionality: convert original field to latinitsa (ISO-9) and add 880s for original cyrillic and latinitsa (SFS-4900)',\n    validate, fix\n  };\n\n  function preprocessConfig() {\n    config.doISO9Transliteration = typeof config.doISO9Transliteration === 'undefined' ? true : config.doISO9Transliteration; // eslint-disable-line functional/immutable-data\n    config.doSFS4900Transliteration = typeof config.doSFS4900Transliteration === 'undefined' ? true : config.doSFS4900Transliteration; // eslint-disable-line functional/immutable-data\n  }\n\n  function fix(record) {\n    // Fix always succeeds\n    const res = {message: [], fix: [], valid: true};\n\n    preprocessConfig(config);\n\n    const nBefore = record.fields.length;\n\n    record.fields = processFields(record.fields); // eslint-disable-line functional/immutable-data\n\n    if (nBefore < record.fields.length) { // eslint-disable-line functional/no-conditional-statements\n      reindexSubfield6OccurenceNumbers().fix(record);\n      sortFields().fix(record);\n    }\n\n    function processFields(input, output = []) {\n      const [currField, ...remainingInput] = input;\n      if (!currField) {\n        return output;\n      }\n\n      const fakeRecord = {fields: output};\n      const createdMax = recordGetMaxSubfield6OccurrenceNumberAsInteger(fakeRecord);\n      const result = processField(currField, record, createdMax);\n\n      return processFields(remainingInput, [...output, ...result]);\n    }\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: [], valid: true};\n\n    preprocessConfig(config);\n\n    record.fields?.forEach(field => {\n      validateField(field, res, record);\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n\n  function validateField(field, res, record) {\n    const orig = fieldToString(field);\n\n    const normalizedFields = processField(clone(field), record);\n    const mod = fieldsToString(normalizedFields).replace(/\\t__SEPARATOR__\\t/ug, ', ').replace(/ (‡6 [0-9][0-9][0-9])-[0-9][0-9]+/gu, ' $1-NN'); // eslint-disable-line prefer-named-capture-group\n    if (orig !== mod) { // Fail as the input is \"broken\"/\"crap\"/sumthing\n      res.message.push(`CHANGE: ${orig} => ${mod}`); // eslint-disable-line functional/immutable-data\n      return;\n    }\n    return;\n  }\n\n  function isCyrillicCharacter(char) {\n    return XRegExp('[\\\\p{Cyrillic}]').test(char); // eslint-disable-line new-cap\n  }\n\n  function containsCyrillicCharacters(str) { // from melinda-ui-cyrillux\n    if (!str) {\n      return false;\n    }\n    return str.split('').some(isCyrillicCharacter);\n  }\n\n  function fieldContainsCyrillicCharacters(field) { // based on melinda-ui-cyrillux\n    return field.subfields && field.subfields.some(sf => subfieldShouldTransliterateToIso9(sf));\n  }\n\n  function subfieldShouldTransliterateToIso9(subfield) {\n    if (isControlSubfieldCode(subfield.code)) {\n      return false;\n    }\n    return containsCyrillicCharacters(subfield.value);\n  }\n\n  function fieldCanBeTransliterated(field) {\n    // Skip certain tags ('880' is the actual skip-me beef here, but we have seen other no-nos as well).\n    // Discussion: We should probably also skip others like 05X-08X, 648, 650, 651, and 655, but this needs thinking...\n    // Also I'd like to co CYRILLIC->ISO-9 for field 300 (and others?) without 880 mappings...\n    if (['336', '337', '338', '880'].includes(field.tag)) {\n      return false;\n    }\n    // Skip control fields:\n    if (!field.subfields) {\n      return false;\n    }\n    // MELINDA-10330: $6 should not prevent translittaration per se, so this restriction is no longer applied!\n\n    if (field.subfields.some(sf => sf.code === '9' && sf.value.includes('<TRANS>'))) {\n      return false;\n    }\n\n    return fieldContainsCyrillicCharacters(field); // We have something to translitterate:\n  }\n\n\n  function mapSubfieldToIso9(subfield) {\n    if (!subfieldShouldTransliterateToIso9(subfield)) {\n      return {code: subfield.code, value: subfield.code}; // just clone\n    }\n    const value = iso9.convertToLatin(subfield.value);\n\n    return {code: subfield.code, value};\n  }\n\n  function mapSubfieldToSfs4900(subfield) {\n    const value = subfieldShouldTransliterateToIso9(subfield) ? sfs4900.convertToLatin(subfield.value).result : subfield.value;\n    return {code: subfield.code, value};\n  }\n\n\n  function mapFieldToIso9(field, occurrenceNumber) {\n    // This is the original non-880 field, that will be converted from Cyrillic to ISO\n\n    // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either\n    if (!config.doISO9Transliteration && !config.doSFS4900Transliteration) {\n      const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));\n      return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};\n    }\n\n    const subfield6 = deriveSubfield6('880', field.subfields, occurrenceNumber);\n    const subfield9 = fieldHasSubfield(field, '9', iso9Trans) ? [] : [{code: '9', value: iso9Trans}];\n\n    const subfields = field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToIso9(sf));\n\n    return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [subfield6, ...subfields, ...subfield9]};\n  }\n\n  function deriveSubfield6(tag, subfields, occurrenceNumber) {\n    const initialSubfield = {code: '6', value: `${tag}-${occurrenceNumber}`};\n    if (tag === '880') { // If *tag in subfield $6* is 880, field is not 880 :D\n      return initialSubfield;\n    }\n    // Try to use existing subfield\n    const [subfield6] = subfields.filter(sf => sf.code === '6').map(sf => clone(sf));\n    if (subfield6) {\n      resetSubfield6Tag(subfield6, tag); // Should we update occurrence number?\n      return subfield6;\n    }\n\n    return initialSubfield;\n  }\n\n  function mapFieldToCyrillicField880(field, occurrenceNumber) {\n    nvdebug(`Derive CYR 880 from ${fieldToString(field)}`);\n    const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);\n    const newSubfield9 = fieldHasSubfield(field, '9', cyrillicTrans) ? [] : [{code: '9', value: cyrillicTrans}];\n    const subfields = [\n      newSubfield6,\n      ...field.subfields.filter(sf => sf.code !== '6').map(sf => clone(sf)),\n      ...newSubfield9\n    ];\n\n    const newField = {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};\n    nvdebug(`       CYR 880      ${fieldToString(newField)}`);\n    return newField;\n  }\n\n  function mapFieldToSfs4900Field880(field, occurrenceNumber) {\n    nvdebug(`Derive SFS 880 from ${fieldToString(field)}`);\n    const newSubfield6 = deriveSubfield6(field.tag, field.subfields, occurrenceNumber);\n    const newSubfield9 = fieldHasSubfield(field, '9', sfs4900Trans) ? [] : [{code: '9', value: sfs4900Trans}];\n    const subfields = [\n      newSubfield6,\n      ...field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToSfs4900(sf)),\n      ...newSubfield9\n    ];\n\n    const newField = {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};\n    nvdebug(`       SFS 880      ${fieldToString(newField)}`);\n    return newField;\n  }\n\n  function getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber = 0) {\n    const occurrenceNumber = fieldGetMaxSubfield6OccurrenceNumberAsInteger(originalField);\n    // Return existing occurrence number:\n    if (occurrenceNumber > 0) {\n      return occurrenceNumber;\n    }\n    if (maxCreatedOccurrenceNumber) {\n      return maxCreatedOccurrenceNumber + 1;\n    }\n    return recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;\n  }\n\n  function needsIso9Transliteration(existingPairedFields) {\n    if (!config.doISO9Transliteration) {\n      return false;\n    }\n    // Actually normal field is always converted to ISO-9, and this function checks where we move original cyrillic field to 880.\n    // Thus we look for field 880$9 \"CYRILLIC <TRANS>\" here, and not \"ISO9 <TRANS>\"!\n    return !existingPairedFields.some(f => fieldHasSubfield(f, '9', cyrillicTrans));\n  }\n\n  function needsSfs4900Transliteration(existingPairedFields) {\n    if (!config.doSFS4900Transliteration) {\n      return false;\n    }\n    return !existingPairedFields.some(f => fieldHasSubfield(f, '9', sfs4900Trans));\n  }\n\n  function processField(originalField, record, maxCreatedOccurrenceNumber = 0) {\n    if (!fieldCanBeTransliterated(originalField)) {\n      return [originalField];\n    }\n\n    nvdebug(`PROCESSING: ${fieldToString(originalField)}`);\n\n    const newOccurrenceNumberAsInt = getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber);\n    const newOccurrenceNumberAsString = intToOccurrenceNumberString(newOccurrenceNumberAsInt);\n\n    nvdebug(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`);\n\n    const existingPairedFields = fieldGetOccurrenceNumberPairs(originalField, record.get('880'));\n\n    nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`);\n\n    const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9\n    const newCyrillicField = needsIso9Transliteration(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC\n    const newSFS4900Field = needsSfs4900Transliteration(existingPairedFields) ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString) : undefined; /// SFS-4900\n\n    return [newMainField, newCyrillicField, newSFS4900Field].filter(f => f);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "11.3.3",
+  "version": "11.3.4-alpha",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -40,12 +40,12 @@
     "@babel/register": "^7.24.6",
     "@natlibfi/issn-verify": "^1.0.4",
     "@natlibfi/marc-record": "^9.0.1",
-    "@natlibfi/marc-record-validate": "^8.0.8",
+    "@natlibfi/marc-record-validate": "^8.0.10",
     "cld3-asm": "^3.1.1",
     "clone": "^2.1.2",
-    "debug": "^4.3.4",
+    "debug": "^4.3.7",
     "iso9_1995": "^0.0.2",
-    "isbn3": "^1.1.52",
+    "isbn3": "^1.2.0",
     "langs": "^2.0.0",
     "node-fetch": "^2.7.0",
     "sfs4900": "^0.0.1",
@@ -53,24 +53,24 @@
     "xregexp": "^5.1.1"
   },
   "peerDependencies": {
-    "@natlibfi/marc-record-validate": "^8.0.7"
+    "@natlibfi/marc-record-validate": "^8.0.10"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",
-    "@babel/core": "^7.24.7",
+    "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.4",
     "@natlibfi/eslint-config-melinda-backend": "^3.0.5",
-    "@natlibfi/fixugen": "^2.0.5",
-    "@natlibfi/fixura": "^3.0.5",
+    "@natlibfi/fixugen": "^2.0.9",
+    "@natlibfi/fixura": "^3.0.8",
     "babel-plugin-istanbul": "^7.0.0",
     "babel-plugin-rewire": "^1.2.0",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.57.0",
-    "fetch-mock": "^11.1.3",
-    "mocha": "^10.4.0",
-    "nyc": "^17.0.0"
+    "eslint": "^8.57.1",
+    "fetch-mock": "^11.1.4",
+    "mocha": "^10.7.3",
+    "nyc": "^17.1.0"
   },
   "eslintConfig": {
     "extends": [

package/src/cyrillux.js

@@ -1,14 +1,18 @@
 //import createDebugLogger from 'debug';
 import clone from 'clone';
-import {fieldToString, fieldsToString, isControlSubfieldCode} from './utils';
+import {fieldHasSubfield, fieldToString, fieldsToString, isControlSubfieldCode, nvdebug} from './utils';
 import * as iso9 from 'iso9_1995';
-import {intToOccurrenceNumberString, recordGetMaxSubfield6OccurrenceNumberAsInteger} from './subfield6Utils';
+import {fieldGetMaxSubfield6OccurrenceNumberAsInteger, fieldGetOccurrenceNumberPairs, intToOccurrenceNumberString, recordGetMaxSubfield6OccurrenceNumberAsInteger, resetSubfield6Tag} from './subfield6Utils';
 
 import XRegExp from 'xregexp';
 import * as sfs4900 from 'sfs4900';
 import {default as sortFields} from './sortFields';
 import {default as reindexSubfield6OccurenceNumbers} from './reindexSubfield6OccurenceNumbers';
 
+const iso9Trans = 'ISO9 <TRANS>';
+const cyrillicTrans = 'CYRILLIC <TRANS>';
+const sfs4900Trans = 'SFS4900 <TRANS>';
+
 export default function (config = {}) {
 
   return {
@@ -99,20 +103,33 @@ export default function (config = {}) {
     return containsCyrillicCharacters(subfield.value);
   }
 
-  function fieldShouldTransliterateToIso9(field) {
-    // Skip certain tags ('880' is the actual skip-me beef here, but we have seen other no-nos as well)
+  function fieldCanBeTransliterated(field) {
+    // Skip certain tags ('880' is the actual skip-me beef here, but we have seen other no-nos as well).
+    // Discussion: We should probably also skip others like 05X-08X, 648, 650, 651, and 655, but this needs thinking...
+    // Also I'd like to co CYRILLIC->ISO-9 for field 300 (and others?) without 880 mappings...
     if (['336', '337', '338', '880'].includes(field.tag)) {
       return false;
     }
-    // Skip control fields and fields that already have a translitteration
-    if (!field.subfields || field.subfields.some(sf => sf.code === '6')) {
+    // Skip control fields:
+    if (!field.subfields) {
       return false;
     }
-    return fieldContainsCyrillicCharacters(field);
+    // MELINDA-10330: $6 should not prevent translittaration per se, so this restriction is no longer applied!
+
+    if (field.subfields.some(sf => sf.code === '9' && sf.value.includes('<TRANS>'))) {
+      return false;
+    }
+
+    return fieldContainsCyrillicCharacters(field); // We have something to translitterate:
   }
 
+
   function mapSubfieldToIso9(subfield) {
-    const value = subfieldShouldTransliterateToIso9(subfield) ? iso9.convertToLatin(subfield.value) : subfield.value;
+    if (!subfieldShouldTransliterateToIso9(subfield)) {
+      return {code: subfield.code, value: subfield.code}; // just clone
+    }
+    const value = iso9.convertToLatin(subfield.value);
+
     return {code: subfield.code, value};
   }
 
@@ -123,50 +140,114 @@ export default function (config = {}) {
 
 
   function mapFieldToIso9(field, occurrenceNumber) {
-    const subfield6 = {code: '6', value: `880-${occurrenceNumber}`};
-    const subfield9 = {code: '9', value: 'ISO9 <TRANS>'};
-
-    const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
+    // This is the original non-880 field, that will be converted from Cyrillic to ISO
 
+    // 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) {
-      // Just converts the field to ISO-9 latinitsa, does not create any field-880s, so don't bother with $6 or $9 either
+      const subfields = field.subfields.map(sf => mapSubfieldToIso9(sf));
       return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields};
     }
 
-    return {tag: field.tag, ind1: field.ind1, ind2: field.ind2, subfields: [subfield6, ...subfields, subfield9]};
+    const subfield6 = deriveSubfield6('880', field.subfields, occurrenceNumber);
+    const subfield9 = fieldHasSubfield(field, '9', iso9Trans) ? [] : [{code: '9', value: iso9Trans}];
+
+    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 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
+      return initialSubfield;
+    }
+    // Try to use existing subfield
+    const [subfield6] = subfields.filter(sf => sf.code === '6').map(sf => clone(sf));
+    if (subfield6) {
+      resetSubfield6Tag(subfield6, tag); // Should we update occurrence number?
+      return subfield6;
+    }
+
+    return initialSubfield;
   }
 
   function mapFieldToCyrillicField880(field, occurrenceNumber) {
+    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}];
     const subfields = [
-      {code: '6', value: `${field.tag}-${occurrenceNumber}`},
-      ...field.subfields.map(sf => clone(sf)),
-      {code: '9', value: 'CYRILLIC <TRANS>'}
+      newSubfield6,
+      ...field.subfields.filter(sf => sf.code !== '6').map(sf => clone(sf)),
+      ...newSubfield9
     ];
 
-    return {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};
+    const newField = {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};
+    nvdebug(`       CYR 880      ${fieldToString(newField)}`);
+    return newField;
   }
 
   function mapFieldToSfs4900Field880(field, occurrenceNumber) {
-
+    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 = [
-      {code: '6', value: `${field.tag}-${occurrenceNumber}`},
-      ...field.subfields.map(sf => mapSubfieldToSfs4900(sf)),
-      {code: '9', value: 'SFS4900 <TRANS>'}
+      newSubfield6,
+      ...field.subfields.filter(sf => sf.code !== '6').map(sf => mapSubfieldToSfs4900(sf)),
+      ...newSubfield9
     ];
 
-    return {tag: '880', ind1: field.ind1, ind2: field.ind2, subfields};
+    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:
+    if (occurrenceNumber > 0) {
+      return occurrenceNumber;
+    }
+    if (maxCreatedOccurrenceNumber) {
+      return maxCreatedOccurrenceNumber + 1;
+    }
+    return recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;
+  }
+
+  function needsIso9Transliteration(existingPairedFields) {
+    if (!config.doISO9Transliteration) {
+      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>"!
+    return !existingPairedFields.some(f => fieldHasSubfield(f, '9', cyrillicTrans));
+  }
+
+  function needsSfs4900Transliteration(existingPairedFields) {
+    if (!config.doSFS4900Transliteration) {
+      return false;
+    }
+    return !existingPairedFields.some(f => fieldHasSubfield(f, '9', sfs4900Trans));
   }
 
   function processField(originalField, record, maxCreatedOccurrenceNumber = 0) {
-    if (!fieldShouldTransliterateToIso9(originalField)) {
+    if (!fieldCanBeTransliterated(originalField)) {
       return [originalField];
     }
-    const newOccurrenceNumberAsInt = maxCreatedOccurrenceNumber ? maxCreatedOccurrenceNumber + 1 : recordGetMaxSubfield6OccurrenceNumberAsInteger(record) + 1;
+
+    nvdebug(`PROCESSING: ${fieldToString(originalField)}`);
+
+    const newOccurrenceNumberAsInt = getNewOccurrenceNumber(originalField, record, maxCreatedOccurrenceNumber);
     const newOccurrenceNumberAsString = intToOccurrenceNumberString(newOccurrenceNumberAsInt);
 
+    nvdebug(`NEW OCCURRENCE NUMBER: '${newOccurrenceNumberAsString}'`);
+
+    const existingPairedFields = fieldGetOccurrenceNumberPairs(originalField, record.get('880'));
+
+    nvdebug(`NUMBER OF PAIRED 880 FIELDS: ${existingPairedFields.length}`);
+
     const newMainField = mapFieldToIso9(originalField, newOccurrenceNumberAsString); // ISO-9
-    const newCyrillicField = config.doISO9Transliteration ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC
-    const newSFS4900Field = config.doSFS4900Transliteration ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString) : undefined; /// SFS-4900
+    const newCyrillicField = needsIso9Transliteration(existingPairedFields) ? mapFieldToCyrillicField880(originalField, newOccurrenceNumberAsString) : undefined; // CYRILLIC
+    const newSFS4900Field = needsSfs4900Transliteration(existingPairedFields) ? mapFieldToSfs4900Field880(originalField, newOccurrenceNumberAsString) : undefined; /// SFS-4900
 
     return [newMainField, newCyrillicField, newSFS4900Field].filter(f => f);
   }

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

@@ -7,6 +7,16 @@
       { "code": "a", "value": "Modin, Ûrij Ivanovič." },
       { "code": "9", "value": "ISO9 <TRANS>"}
     ]},
+    { "tag": "300", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-02"},
+      { "code": "a", "value": "5 sm." },
+      { "code": "9", "value": "ISO9 <TRANS>"}
+    ]},
+    { "tag": "500", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-03"},
+      { "code": "a", "value": "5 sm." },
+      { "code": "9", "value": "ISO9 <TRANS>"}
+    ]},
     { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
       {"code": "6", "value": "100-01"},
       {"code": "a", "value": "Модин, Юрий Иванович."},
@@ -16,8 +26,27 @@
       {"code": "6", "value": "100-01"},
       {"code": "a", "value": "Modin, Juri Ivanovitš."},
       {"code": "9", "value": "SFS4900 <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "300-02" },
+      { "code": "a", "value": "5 см."},
+      { "code": "9", "value": "CYRILLIC <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "300-02" },
+      { "code": "a", "value": "5 sm." },
+      { "code": "9", "value": "SFS4900 <TRANS>" }
+    ]},
+    { "tag": "880", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "500-03" },
+      { "code": "a", "value": "5 см." },
+      { "code": "9", "value": "CYRILLIC <TRANS>" }
+    ]},
+    { "tag": "880", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "500-03" },
+      { "code": "a", "value": "5 sm." },
+      { "code": "9", "value": "SFS4900 <TRANS>" }
     ]}
-
   ]
 }
 

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

@@ -3,6 +3,12 @@
   "fields": [
     { "tag": "100", "ind1": "1", "ind2": " ", "subfields": [
         { "code": "a", "value": "Модин, Юрий Иванович." }
+    ]},
+    { "tag": "300", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "a", "value": "5 см." }
+    ]},
+    { "tag": "500", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "a", "value": "5 см." }
     ]}
   ]
 }

package/test-fixtures/cyrillux/f03/expectedResult.json

@@ -7,6 +7,14 @@
     ]},
     { "tag": "245", "ind1": "1", "ind2": " ", "subfields": [
       { "code": "a", "value": "Sudʹby razvedčikov." }
+    ]},
+    {"tag": "500", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-01"},
+      { "code": "a", "value": "FOO."}
+    ]},
+    {"tag": "880", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "500-01"},
+      { "code": "a", "value": "BAR."}
     ]}
   ]
 }

package/test-fixtures/cyrillux/f03/record.json

@@ -6,6 +6,14 @@
     ]},
     {"tag": "245", "ind1": "1", "ind2": " ", "subfields": [
       { "code": "a", "value": "Судьбы разведчиков."}
+    ]},
+    {"tag": "500", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-01"},
+      { "code": "a", "value": "FOO."}
+    ]},
+    {"tag": "880", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "6", "value": "500-01"},
+      { "code": "a", "value": "BAR."}
     ]}
   ]
 }

package/test-fixtures/cyrillux/f06/expectedResult.json

@@ -0,0 +1,53 @@
+{
+  "_validationOptions": {},
+  "leader": "12345cam  22123454i 4500",
+  "fields": [
+    { "tag": "100", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-01"},
+      { "code": "a", "value": "Modin, Ûrij Ivanovič." },
+      { "code": "9", "value": "ISO9 <TRANS>"}
+    ]},
+    { "tag": "245", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-02"},
+      { "code": "a", "value": "Sudʹby razvedčikov." },
+      { "code": "9", "value": "ISO9 <TRANS>"}
+    ]},
+    { "tag": "650", "ind1": "4", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-03" },
+      { "code": "a", "value": "whatever." }
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "100-01"},
+      {"code": "a", "value": "Модин, Юрий Иванович."},
+      {"code": "9", "value": "CYRILLIC <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "100-01"},
+      {"code": "a", "value": "Modin, Juri Ivanovitš."},
+      {"code": "9", "value": "SFS4900 <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "100-01" },
+      { "code": "a", "value": "whatever100." }
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "245-02"},
+      {"code": "a", "value": "Судьбы разведчиков."},
+      {"code": "9", "value": "CYRILLIC <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "245-02"},
+      {"code": "a", "value": "Sudby razvedtšikov."},
+      {"code": "9", "value": "SFS4900 <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "245-02" },
+      { "code": "a", "value": "whatever245." }
+    ]},
+    { "tag": "880", "ind1": "4", "ind2": " ", "subfields": [
+      { "code": "6", "value": "650-03" },
+      { "code": "a", "value": "whatever650." }
+    ]}
+  ]
+}
+

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

@@ -0,0 +1,10 @@
+{
+  "description": "Fix: fields 100  and 245 require translitteration, even if they already have unnamed 880 pair",
+  "comment": "Tests incrementation of occurrence numbers and usage of config",
+  "only": false,
+  "fix": true,
+  "config": {
+    "doISO9Transliteration": true,
+    "doSFS4900Transliteration": true
+  }
+}

package/test-fixtures/cyrillux/f06/record.json

@@ -0,0 +1,29 @@
+{
+  "leader": "12345cam  22123454i 4500",
+  "fields": [
+    { "tag": "100", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-01" },
+      { "code": "a", "value": "Модин, Юрий Иванович." }
+    ]},
+    {"tag": "245", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-02" },
+      { "code": "a", "value": "Судьбы разведчиков."}
+    ]},
+    { "tag": "650", "ind1": "4", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-03" },
+      { "code": "a", "value": "whatever." }
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "100-01" },
+      { "code": "a", "value": "whatever100." }
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "245-02" },
+      { "code": "a", "value": "whatever245." }
+    ]},
+    { "tag": "880", "ind1": "4", "ind2": " ", "subfields": [
+      { "code": "6", "value": "650-03" },
+      { "code": "a", "value": "whatever650." }
+    ]}
+  ]
+}

package/test-fixtures/cyrillux/f07/expectedResult.json

@@ -0,0 +1,40 @@
+{
+  "_validationOptions": {},
+  "leader": "12345cam  22123454i 4500",
+  "fields": [
+    { "tag": "100", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-01"},
+      { "code": "a", "value": "Modin, Ûrij Ivanovič." },
+      { "code": "9", "value": "ISO9 <TRANS>"}
+    ]},
+    { "tag": "245", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-02"},
+      { "code": "a", "value": "Sudʹby razvedčikov." },
+      { "code": "9", "value": "ISO9 <TRANS>"}
+    ]},
+    { "tag": "650", "ind1": "4", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-03" },
+      { "code": "a", "value": "whatever." }
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "100-01"},
+      {"code": "a", "value": "Модин, Юрий Иванович."},
+      {"code": "9", "value": "CYRILLIC <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "100-01"},
+      {"code": "a", "value": "PIDÄ ALKUPERÄINEN ARVO 1."},
+      {"code": "9", "value": "SFS4900 <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "245-02"},
+      {"code": "a", "value": "Sudby razvedtšikov."},
+      {"code": "9", "value": "SFS4900 <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "245-02"},
+      {"code": "a", "value": "PIDÄ ALKUPERÄINEN ARVO 2."},
+      {"code": "9", "value": "CYRILLIC <TRANS>"}
+    ]}
+  ]
+}

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

@@ -0,0 +1,10 @@
+{
+  "description": "Fix: fields 100  and 245: one translation is missing and the other one exists: add missing translation, keep existin (crappy translation) ",
+  "comment": "Tests also incrementation of occurrence number.",
+  "only": false,
+  "fix": true,
+  "config": {
+    "doISO9Transliteration": true,
+    "doSFS4900Transliteration": true
+  }
+}

package/test-fixtures/cyrillux/f07/record.json

@@ -0,0 +1,27 @@
+{
+  "leader": "12345cam  22123454i 4500",
+  "fields": [
+    { "tag": "100", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-04" },
+      { "code": "a", "value": "Модин, Юрий Иванович." }
+    ]},
+    {"tag": "245", "ind1": "1", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-03" },
+      { "code": "a", "value": "Судьбы разведчиков."}
+    ]},
+    { "tag": "650", "ind1": "4", "ind2": " ", "subfields": [
+      { "code": "6", "value": "880-02" },
+      { "code": "a", "value": "whatever." }
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "100-04"},
+      {"code": "a", "value": "PIDÄ ALKUPERÄINEN ARVO 1."},
+      {"code": "9", "value": "SFS4900 <TRANS>"}
+    ]},
+    { "tag": "880", "ind1": "1", "ind2": " ", "subfields": [
+      {"code": "6", "value": "245-03"},
+      {"code": "a", "value": "PIDÄ ALKUPERÄINEN ARVO 2."},
+      {"code": "9", "value": "CYRILLIC <TRANS>"}
+    ]}
+  ]
+}