@natlibfi/marc-record-validators-melinda 10.11.1 → 10.12.0-alpha.2

package/dist/prepublicationUtils.js

@@ -0,0 +1,242 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.baseHasEqualOrHigherEncodingLevel = baseHasEqualOrHigherEncodingLevel;
+exports.deleteAllPrepublicationNotesFromField500InNonPubRecord = deleteAllPrepublicationNotesFromField500InNonPubRecord;
+exports.encodingLevelIsBetterThanPrepublication = encodingLevelIsBetterThanPrepublication;
+exports.fieldRefersToEnnakkotieto = fieldRefersToEnnakkotieto;
+exports.fieldRefersToKoneellisestiTuotettuTietue = fieldRefersToKoneellisestiTuotettuTietue;
+exports.fieldRefersToTarkistettuEnnakkotieto = fieldRefersToTarkistettuEnnakkotieto;
+exports.firstFieldHasBetterPrepubEncodingLevel = firstFieldHasBetterPrepubEncodingLevel;
+exports.getEncodingLevel = getEncodingLevel;
+exports.getPrepublicationLevel = getPrepublicationLevel;
+exports.getRelevant5XXFields = getRelevant5XXFields;
+exports.isEnnakkotietoField = isEnnakkotietoField;
+exports.isEnnakkotietoSubfield = isEnnakkotietoSubfield;
+exports.isFikkaRecord = isFikkaRecord;
+exports.isKingOfTheHill = isKingOfTheHill;
+exports.prepublicationLevelIsKoneellisestiTuotettuTietueOrTarkistettuEnnakkotieto = prepublicationLevelIsKoneellisestiTuotettuTietueOrTarkistettuEnnakkotieto;
+exports.removeWorsePrepubField500s = removeWorsePrepubField500s;
+exports.removeWorsePrepubField594s = removeWorsePrepubField594s;
+var _utils = require("./utils");
+var _debug = _interopRequireDefault(require("debug"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda:prepublicationUtils');
+//const debugData = debug.extend('data');
+const debugDev = debug.extend('dev');
+const KONEELLISESTI_TUOTETTU_TIETUE = 1; // Best
+const TARKISTETTU_ENNAKKOTIETO = 2;
+const ENNAKKOTIETO = 3;
+//const EI_TASOA = 4;
+
+const encodingLevelPreferenceArray = [' ', '1', '3', '4', '5', '2', '7', 'u', 'z', '8']; // MET-145
+const prepublicationLevelIndex = encodingLevelPreferenceArray.indexOf('8');
+function prepublicationLevelIsKoneellisestiTuotettuTietueOrTarkistettuEnnakkotieto(prepublicationLevel) {
+  return prepublicationLevel === KONEELLISESTI_TUOTETTU_TIETUE || prepublicationLevel === TARKISTETTU_ENNAKKOTIETO;
+}
+function encodingLevelIsBetterThanPrepublication(encodingLevel) {
+  const index = encodingLevelPreferenceArray.indexOf(encodingLevel);
+  return index > -1 && index < prepublicationLevelIndex;
+}
+function containsSubstringInSubfieldA(field, substring) {
+  return field.subfields.some(sf => sf.code === 'a' && sf.value.includes(substring));
+}
+
+// These three functions below all refer to field 500:
+function fieldRefersToKoneellisestiTuotettuTietue(field) {
+  return containsSubstringInSubfieldA(field, 'Koneellisesti tuotettu tietue');
+}
+function fieldRefersToTarkistettuEnnakkotieto(field) {
+  return containsSubstringInSubfieldA(field, 'TARKISTETTU ENNAKKOTIETO');
+}
+function fieldRefersToEnnakkotieto(field) {
+  // NB! This matches also 'TARKISTETTU ENNAKKOTIETO' case!
+  return containsSubstringInSubfieldA(field, 'ENNAKKOTIETO');
+}
+function firstFieldHasBetterPrepubEncodingLevel(field1, field2) {
+  if (fieldRefersToKoneellisestiTuotettuTietue(field2)) {
+    return false;
+  }
+  if (fieldRefersToKoneellisestiTuotettuTietue(field1)) {
+    return true;
+  }
+  if (fieldRefersToTarkistettuEnnakkotieto(field2)) {
+    return false;
+  }
+  if (fieldRefersToTarkistettuEnnakkotieto(field1)) {
+    return true;
+  }
+  if (fieldRefersToEnnakkotieto(field2)) {
+    return false;
+  }
+  if (fieldRefersToEnnakkotieto(field1)) {
+    return true;
+  }
+  return false;
+}
+
+/*
+export function firstFieldHasEqualOrBetterPrepubEncodingLevel(field1, field2) {
+  // Could be optimized...
+  if (fieldRefersToKoneellisestiTuotettuTietue(field1)) {
+    return true;
+  }
+  if (fieldRefersToKoneellisestiTuotettuTietue(field2)) {
+    return false;
+  }
+  if (fieldRefersToTarkistettuEnnakkotieto(field1)) {
+    return true;
+  }
+  if (fieldRefersToTarkistettuEnnakkotieto(field2)) {
+    return false;
+  }
+  if (fieldRefersToEnnakkotieto(field1)) {
+    return true;
+  }
+  return !fieldRefersToEnnakkotieto(field2);
+}
+*/
+
+/*
+function hasEnnakkotietoSubfield(field) {
+  return field.subfields.some(sf => ['g', '9'].includes(sf.code) && sf.value.includes('ENNAKKOTIETO'));
+}
+*/
+
+/*
+export function isPrepublicationField6XX(field) {
+  if (!field.tag.match(/^6(?:[0-4][0-9]|5[0-5])$/u)) { // Not within 600 ... 655 range
+    return false;
+  }
+  return field.subfields.some(sf => hasEnnakkotietoSubfield(sf));
+}
+*/
+
+function getRelevant5XXFields(record, f500 = false, f594 = false) {
+  const cands = actualGetFields();
+  //nvdebugFieldArray(cands, 'gR5XXa: ', debugDev);
+  const filtered = cands.filter(field => hasRelevantPrepubData(field));
+  //nvdebugFieldArray(filtered, 'gR5XXb: ', debugDev);
+  return filtered;
+
+  //return actualGetFields().filter(field => hasRelevantPrepubData(field));
+
+  function hasRelevantPrepubData(field) {
+    // Check prepub ($a):
+    if (!fieldRefersToKoneellisestiTuotettuTietue(field) && !fieldRefersToEnnakkotieto(field)) {
+      return false;
+    }
+    // Check relevance (594$5):
+    if (field.tag === '500') {
+      return field.subfields.every(sf => sf.code !== '5'); //true;
+    }
+
+    return field.subfields.some(sf => sf.code === '5' && ['FENNI', 'FIKKA', 'VIOLA'].includes(sf.value));
+  }
+  function actualGetFields() {
+    if (f500 && f594) {
+      return record.get(/^(?:500|594)$/u);
+    }
+    if (f500) {
+      return record.get(/^500$/u);
+    }
+    if (f594) {
+      return record.get(/^594$/u);
+    }
+    return [];
+  }
+}
+
+// Very similar to getPrepublicationLevel() in melinda-record-match-validator's getPrepublicationLevel()...
+// We should use that and not have a copy here...
+function getPrepublicationLevel(record, f500 = false, f594 = false) {
+  // Smaller return value is better
+  const fields = getRelevant5XXFields(record, f500, f594);
+  if (!fields) {
+    return null;
+  }
+  if (fields.some(f => fieldRefersToKoneellisestiTuotettuTietue(f))) {
+    return KONEELLISESTI_TUOTETTU_TIETUE;
+  }
+  if (fields.some(f => fieldRefersToTarkistettuEnnakkotieto(f))) {
+    return TARKISTETTU_ENNAKKOTIETO;
+  }
+  if (fields.some(f => fieldRefersToEnnakkotieto(f))) {
+    return ENNAKKOTIETO;
+  }
+  return null;
+}
+function baseHasEqualOrHigherEncodingLevel(baseEncodingLevel, sourceEncodingLevel) {
+  const baseIndex = encodingLevelPreferenceArray.indexOf(baseEncodingLevel);
+  const sourceIndex = encodingLevelPreferenceArray.indexOf(sourceEncodingLevel);
+  if (baseIndex === -1) {
+    // Base wins if both are bad:
+    return sourceIndex === -1;
+  }
+  return baseIndex <= sourceIndex;
+}
+function hasFikkaLOW(record) {
+  return record.fields.some(field => field.tag === 'LOW' && (0, _utils.fieldHasSubfield)(field, 'a', 'FIKKA'));
+}
+function hasNatLibFi042(record) {
+  return record.fields.some(field => field.tag === '042' && ((0, _utils.fieldHasSubfield)(field, 'a', 'finb') || (0, _utils.fieldHasSubfield)(field, 'a', 'finbd')));
+}
+function isFikkaRecord(record) {
+  // NB! Does not include Humaniora. Pienpainatteet (not that they'd have duplicates)?
+  return hasFikkaLOW(record) && hasNatLibFi042(record);
+}
+function getEncodingLevel(record) {
+  return record.leader.substring(17, 18);
+}
+function deleteAllPrepublicationNotesFromField500InNonPubRecord(record) {
+  const encodingLevel = getEncodingLevel(record);
+  // Skip prepublication (or theoretically even worse) records:
+  if (!encodingLevelIsBetterThanPrepublication(encodingLevel)) {
+    //if (['2', '8'].includes(encodingLevel)) { // MET-306: added '2' here
+    return;
+  }
+
+  // MET-306: keep "koneellisesti tuotettu tietue" if encodng level is '2':
+  const f500 = getRelevant5XXFields(record, true, false).filter(field => encodingLevel === '2' ? !fieldRefersToKoneellisestiTuotettuTietue(field) : true);
+  if (f500.length === 0) {
+    return;
+  }
+  (0, _utils.nvdebug)(`Delete all ${f500.length} instance(s) of field 500`, debugDev);
+  f500.forEach(field => record.removeField(field));
+}
+function removeWorsePrepubField500s(record) {
+  // Remove lower-level entries:
+  const fields = getRelevant5XXFields(record, true, false); // 500=false, 594=true
+  (0, _utils.nvdebugFieldArray)(fields, '  Candidates for non-best 500 b4 filtering: ', debugDev);
+  const nonBest = fields.filter(field => fields.some(field2 => firstFieldHasBetterPrepubEncodingLevel(field2, field)));
+  (0, _utils.nvdebugFieldArray)(nonBest, '  Remove non-best 500: ', debugDev);
+  nonBest.forEach(field => record.removeField(field));
+}
+function removeWorsePrepubField594s(record) {
+  // Remove lower-level entries:
+  const fields594 = getRelevant5XXFields(record, false, true); // 500=false, 594=true
+  (0, _utils.nvdebugFieldArray)(fields594, '  Candidates for non-best 594 b4 filtering: ', debugDev);
+  const nonBest = fields594.filter(field => fields594.some(field2 => firstFieldHasBetterPrepubEncodingLevel(field2, field)));
+  (0, _utils.nvdebugFieldArray)(nonBest, '  Remove non-best 594: ', debugDev);
+  nonBest.forEach(field => record.removeField(field));
+}
+function isEnnakkotietoSubfield(subfield) {
+  if (subfield.code !== '9' && subfield.code !== 'g') {
+    return false;
+  }
+  // Length <= 13 allows punctuation, but does not require it:
+  if (subfield.value.substr(0, 12) === 'ENNAKKOTIETO' && subfield.value.length <= 13) {
+    return true;
+  }
+  return false;
+}
+function isEnnakkotietoField(field) {
+  return field.subfields.some(sf => isEnnakkotietoSubfield(sf));
+}
+function isKingOfTheHill(field, opposingFields) {
+  // Field is no better than at least one of the opposing fields
+  return opposingFields.every(opposingField => firstFieldHasBetterPrepubEncodingLevel(field, opposingField));
+}
+//# sourceMappingURL=prepublicationUtils.js.map

package/dist/prepublicationUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepublicationUtils.js","names":["_utils","require","_debug","_interopRequireDefault","obj","__esModule","default","debug","createDebugLogger","debugDev","extend","KONEELLISESTI_TUOTETTU_TIETUE","TARKISTETTU_ENNAKKOTIETO","ENNAKKOTIETO","encodingLevelPreferenceArray","prepublicationLevelIndex","indexOf","prepublicationLevelIsKoneellisestiTuotettuTietueOrTarkistettuEnnakkotieto","prepublicationLevel","encodingLevelIsBetterThanPrepublication","encodingLevel","index","containsSubstringInSubfieldA","field","substring","subfields","some","sf","code","value","includes","fieldRefersToKoneellisestiTuotettuTietue","fieldRefersToTarkistettuEnnakkotieto","fieldRefersToEnnakkotieto","firstFieldHasBetterPrepubEncodingLevel","field1","field2","getRelevant5XXFields","record","f500","f594","cands","actualGetFields","filtered","filter","hasRelevantPrepubData","tag","every","get","getPrepublicationLevel","fields","f","baseHasEqualOrHigherEncodingLevel","baseEncodingLevel","sourceEncodingLevel","baseIndex","sourceIndex","hasFikkaLOW","fieldHasSubfield","hasNatLibFi042","isFikkaRecord","getEncodingLevel","leader","deleteAllPrepublicationNotesFromField500InNonPubRecord","length","nvdebug","forEach","removeField","removeWorsePrepubField500s","nvdebugFieldArray","nonBest","removeWorsePrepubField594s","fields594","isEnnakkotietoSubfield","subfield","substr","isEnnakkotietoField","isKingOfTheHill","opposingFields","opposingField"],"sources":["../src/prepublicationUtils.js"],"sourcesContent":["import {fieldHasSubfield, nvdebug, nvdebugFieldArray} from './utils';\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:prepublicationUtils');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nconst KONEELLISESTI_TUOTETTU_TIETUE = 1; // Best\nconst TARKISTETTU_ENNAKKOTIETO = 2;\nconst ENNAKKOTIETO = 3;\n//const EI_TASOA = 4;\n\nconst encodingLevelPreferenceArray = [' ', '1', '3', '4', '5', '2', '7', 'u', 'z', '8']; // MET-145\nconst prepublicationLevelIndex = encodingLevelPreferenceArray.indexOf('8');\n\nexport function prepublicationLevelIsKoneellisestiTuotettuTietueOrTarkistettuEnnakkotieto(prepublicationLevel) {\n  return prepublicationLevel === KONEELLISESTI_TUOTETTU_TIETUE || prepublicationLevel === TARKISTETTU_ENNAKKOTIETO;\n}\n\n\nexport function encodingLevelIsBetterThanPrepublication(encodingLevel) {\n  const index = encodingLevelPreferenceArray.indexOf(encodingLevel);\n  return index > -1 && index < prepublicationLevelIndex;\n}\n\n\nfunction containsSubstringInSubfieldA(field, substring) {\n  return field.subfields.some(sf => sf.code === 'a' && sf.value.includes(substring));\n}\n\n\n// These three functions below all refer to field 500:\nexport function fieldRefersToKoneellisestiTuotettuTietue(field) {\n  return containsSubstringInSubfieldA(field, 'Koneellisesti tuotettu tietue');\n}\n\n\nexport function fieldRefersToTarkistettuEnnakkotieto(field) {\n  return containsSubstringInSubfieldA(field, 'TARKISTETTU ENNAKKOTIETO');\n}\n\n\nexport function fieldRefersToEnnakkotieto(field) {\n  // NB! This matches also 'TARKISTETTU ENNAKKOTIETO' case!\n  return containsSubstringInSubfieldA(field, 'ENNAKKOTIETO');\n}\n\n\nexport function firstFieldHasBetterPrepubEncodingLevel(field1, field2) {\n  if (fieldRefersToKoneellisestiTuotettuTietue(field2)) {\n    return false;\n  }\n  if (fieldRefersToKoneellisestiTuotettuTietue(field1)) {\n    return true;\n  }\n  if (fieldRefersToTarkistettuEnnakkotieto(field2)) {\n    return false;\n  }\n  if (fieldRefersToTarkistettuEnnakkotieto(field1)) {\n    return true;\n  }\n  if (fieldRefersToEnnakkotieto(field2)) {\n    return false;\n  }\n  if (fieldRefersToEnnakkotieto(field1)) {\n    return true;\n  }\n  return false;\n}\n\n/*\nexport function firstFieldHasEqualOrBetterPrepubEncodingLevel(field1, field2) {\n  // Could be optimized...\n  if (fieldRefersToKoneellisestiTuotettuTietue(field1)) {\n    return true;\n  }\n  if (fieldRefersToKoneellisestiTuotettuTietue(field2)) {\n    return false;\n  }\n  if (fieldRefersToTarkistettuEnnakkotieto(field1)) {\n    return true;\n  }\n  if (fieldRefersToTarkistettuEnnakkotieto(field2)) {\n    return false;\n  }\n  if (fieldRefersToEnnakkotieto(field1)) {\n    return true;\n  }\n  return !fieldRefersToEnnakkotieto(field2);\n}\n*/\n\n/*\nfunction hasEnnakkotietoSubfield(field) {\n  return field.subfields.some(sf => ['g', '9'].includes(sf.code) && sf.value.includes('ENNAKKOTIETO'));\n}\n*/\n\n/*\nexport function isPrepublicationField6XX(field) {\n  if (!field.tag.match(/^6(?:[0-4][0-9]|5[0-5])$/u)) { // Not within 600 ... 655 range\n    return false;\n  }\n  return field.subfields.some(sf => hasEnnakkotietoSubfield(sf));\n}\n*/\n\n\nexport function getRelevant5XXFields(record, f500 = false, f594 = false) {\n  const cands = actualGetFields();\n  //nvdebugFieldArray(cands, 'gR5XXa: ', debugDev);\n  const filtered = cands.filter(field => hasRelevantPrepubData(field));\n  //nvdebugFieldArray(filtered, 'gR5XXb: ', debugDev);\n  return filtered;\n\n  //return actualGetFields().filter(field => hasRelevantPrepubData(field));\n\n  function hasRelevantPrepubData(field) {\n    // Check prepub ($a):\n    if (!fieldRefersToKoneellisestiTuotettuTietue(field) && !fieldRefersToEnnakkotieto(field)) {\n      return false;\n    }\n    // Check relevance (594$5):\n    if (field.tag === '500') {\n      return field.subfields.every(sf => sf.code !== '5'); //true;\n    }\n    return field.subfields.some(sf => sf.code === '5' && ['FENNI', 'FIKKA', 'VIOLA'].includes(sf.value));\n  }\n\n  function actualGetFields() {\n    if (f500 && f594) {\n      return record.get(/^(?:500|594)$/u);\n    }\n    if (f500) {\n      return record.get(/^500$/u);\n    }\n    if (f594) {\n      return record.get(/^594$/u);\n    }\n    return [];\n  }\n\n}\n\n\n// Very similar to getPrepublicationLevel() in melinda-record-match-validator's getPrepublicationLevel()...\n// We should use that and not have a copy here...\nexport function getPrepublicationLevel(record, f500 = false, f594 = false) {\n  // Smaller return value is better\n  const fields = getRelevant5XXFields(record, f500, f594);\n\n  if (!fields) {\n    return null;\n  }\n  if (fields.some(f => fieldRefersToKoneellisestiTuotettuTietue(f))) {\n    return KONEELLISESTI_TUOTETTU_TIETUE;\n  }\n\n  if (fields.some(f => fieldRefersToTarkistettuEnnakkotieto(f))) {\n    return TARKISTETTU_ENNAKKOTIETO;\n  }\n\n  if (fields.some(f => fieldRefersToEnnakkotieto(f))) {\n    return ENNAKKOTIETO;\n  }\n\n  return null;\n}\n\n\nexport function baseHasEqualOrHigherEncodingLevel(baseEncodingLevel, sourceEncodingLevel) {\n  const baseIndex = encodingLevelPreferenceArray.indexOf(baseEncodingLevel);\n  const sourceIndex = encodingLevelPreferenceArray.indexOf(sourceEncodingLevel);\n\n  if (baseIndex === -1) {\n    // Base wins if both are bad:\n    return sourceIndex === -1;\n  }\n  return baseIndex <= sourceIndex;\n}\n\n\nfunction hasFikkaLOW(record) {\n  return record.fields.some(field => field.tag === 'LOW' && fieldHasSubfield(field, 'a', 'FIKKA'));\n}\n\n\nfunction hasNatLibFi042(record) {\n  return record.fields.some(field => field.tag === '042' && (fieldHasSubfield(field, 'a', 'finb') || fieldHasSubfield(field, 'a', 'finbd')));\n}\n\n\nexport function isFikkaRecord(record) {\n  // NB! Does not include Humaniora. Pienpainatteet (not that they'd have duplicates)?\n  return hasFikkaLOW(record) && hasNatLibFi042(record);\n}\n\n\nexport function getEncodingLevel(record) {\n  return record.leader.substring(17, 18);\n}\n\n\nexport function deleteAllPrepublicationNotesFromField500InNonPubRecord(record) {\n  const encodingLevel = getEncodingLevel(record);\n  // Skip prepublication (or theoretically even worse) records:\n  if (!encodingLevelIsBetterThanPrepublication(encodingLevel)) {\n  //if (['2', '8'].includes(encodingLevel)) { // MET-306: added '2' here\n    return;\n  }\n\n  // MET-306: keep \"koneellisesti tuotettu tietue\" if encodng level is '2':\n  const f500 = getRelevant5XXFields(record, true, false).filter(field => encodingLevel === '2' ? !fieldRefersToKoneellisestiTuotettuTietue(field) : true);\n  if (f500.length === 0) {\n    return;\n  }\n\n\n  nvdebug(`Delete all ${f500.length} instance(s) of field 500`, debugDev);\n  f500.forEach(field => record.removeField(field));\n}\n\n\nexport function removeWorsePrepubField500s(record) {\n  // Remove lower-level entries:\n  const fields = getRelevant5XXFields(record, true, false); // 500=false, 594=true\n  nvdebugFieldArray(fields, '  Candidates for non-best 500 b4 filtering: ', debugDev);\n  const nonBest = fields.filter(field => fields.some(field2 => firstFieldHasBetterPrepubEncodingLevel(field2, field)));\n  nvdebugFieldArray(nonBest, '  Remove non-best 500: ', debugDev);\n  nonBest.forEach(field => record.removeField(field));\n}\n\n\nexport function removeWorsePrepubField594s(record) {\n  // Remove lower-level entries:\n  const fields594 = getRelevant5XXFields(record, false, true); // 500=false, 594=true\n  nvdebugFieldArray(fields594, '  Candidates for non-best 594 b4 filtering: ', debugDev);\n  const nonBest = fields594.filter(field => fields594.some(field2 => firstFieldHasBetterPrepubEncodingLevel(field2, field)));\n  nvdebugFieldArray(nonBest, '  Remove non-best 594: ', debugDev);\n  nonBest.forEach(field => record.removeField(field));\n}\n\n\nexport function isEnnakkotietoSubfield(subfield) {\n  if (subfield.code !== '9' && subfield.code !== 'g') {\n    return false;\n  }\n  // Length <= 13 allows punctuation, but does not require it:\n  if (subfield.value.substr(0, 12) === 'ENNAKKOTIETO' && subfield.value.length <= 13) {\n    return true;\n  }\n  return false;\n}\n\nexport function isEnnakkotietoField(field) {\n  return field.subfields.some(sf => isEnnakkotietoSubfield(sf));\n}\n\nexport function isKingOfTheHill(field, opposingFields) {\n  // Field is no better than at least one of the opposing fields\n  return opposingFields.every(opposingField => firstFieldHasBetterPrepubEncodingLevel(field, opposingField));\n}\n\n"],"mappings":"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"}

package/dist/punctuation2.js

@@ -340,6 +340,47 @@ const cleanLegalSeriesTitle = [
   'followedBy': 'v',
   'remove': / *;$/u
 }];
+const clean24X = [{
+  'name': 'I:A',
+  'code': 'i',
+  'followedBy': 'i',
+  'remove': / *:$/u
+}, {
+  'name': 'A:B',
+  'code': 'a',
+  'followedBy': 'b',
+  'remove': / [:;=]$/u
+}, {
+  'name': 'AB:K',
+  'code': 'ab',
+  'followedBy': 'k',
+  'remove': / :$/u
+}, {
+  'name': 'ABK:F',
+  'code': 'abk',
+  'followedBy': 'f',
+  'remove': /,$/u
+}, {
+  'name': 'ABFNP:C',
+  'code': 'abfnp',
+  'followedBy': 'c',
+  'remove': / \/$/u
+}, {
+  'name': 'ABN:N',
+  'code': 'abn',
+  'followedBy': 'n',
+  'remove': /\.$/u
+}, {
+  'name': 'ABNP:#',
+  'code': 'abnp',
+  'followedBy': '#',
+  'remove': /\.$/u
+}, {
+  'name': 'N:P',
+  'code': 'n',
+  'followedBy': 'p',
+  'remove': /,$/u
+}];
 const cleanValidPunctuationRules = {
   '100': legalX00punc,
   '110': legalX10punc,
@@ -349,42 +390,8 @@ const cleanValidPunctuationRules = {
   '710': legalX10punc,
   '800': legalX00punc,
   '810': legalX10punc,
-  '245': [{
-    'name': 'A:B',
-    'code': 'a',
-    'followedBy': 'b',
-    'remove': / [:;=]$/u
-  }, {
-    'name': 'AB:K',
-    'code': 'ab',
-    'followedBy': 'k',
-    'remove': / :$/u
-  }, {
-    'name': 'ABK:F',
-    'code': 'abk',
-    'followedBy': 'f',
-    'remove': /,$/u
-  }, {
-    'name': 'ABFNP:C',
-    'code': 'abfnp',
-    'followedBy': 'c',
-    'remove': / \/$/u
-  }, {
-    'name': 'ABN:N',
-    'code': 'abn',
-    'followedBy': 'n',
-    'remove': /\.$/u
-  }, {
-    'name': 'ABNP:#',
-    'code': 'abnp',
-    'followedBy': '#',
-    'remove': /\.$/u
-  }, {
-    'name': 'N:P',
-    'code': 'n',
-    'followedBy': 'p',
-    'remove': /,$/u
-  }],
+  '245': clean24X,
+  '246': clean24X,
   '260': [{
     'code': 'a',
     'followedBy': 'b',
@@ -453,12 +460,66 @@ const cleanValidPunctuationRules = {
     'ind2': ['4'],
     'remove': /\.$/u
   }],
-  '830': cleanLegalSeriesTitle
+  '830': cleanLegalSeriesTitle,
+  '946': clean24X
 };
 
 // addColonToRelationshipInformation only applies to 700/710 but as others don't have $i, it's fine
 const addX00 = [addX00aComma, addX00aComma2, addX00aDot, addLanguageComma, addSemicolonBeforeVolumeDesignation, addColonToRelationshipInformation];
 const addX10 = [addX10bDot, addX10eComma, addX10Dot, addLanguageComma, addSemicolonBeforeVolumeDesignation, addColonToRelationshipInformation];
+const add245 = [
+// Blah! Also "$a = $b" and "$a ; $b" can be valid... But ' :' is better than nothing, I guess...
+{
+  'code': 'a',
+  'followedBy': 'b',
+  'add': ' :',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'abk',
+  'followedBy': 'f',
+  'add': ',',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'abfnp',
+  'followedBy': 'c',
+  'add': ' /',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'abc',
+  'followedBy': '#',
+  'add': '.',
+  'context': defaultNeedsPuncAfter
+} // Stepping on punctuation/ toes
+];
+
+const add246 = [{
+  'code': 'i',
+  'followedBy': 'a',
+  'add': ':',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'a',
+  'followedBy': 'b',
+  'add': ' :',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'abk',
+  'followedBy': 'f',
+  'add': ',',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'abfnp',
+  'followedBy': 'c',
+  'add': ' /',
+  'context': defaultNeedsPuncAfter
+}, {
+  'code': 'abc',
+  'followedBy': '#',
+  'add': '.',
+  'context': defaultNeedsPuncAfter
+} // Stepping on punctuation/ toes
+];
+
 const addSeriesTitle = [
 // 490 and 830
 {
@@ -477,31 +538,8 @@ const addSeriesTitle = [
 const addPairedPunctuationRules = {
   '100': addX00,
   '110': addX10,
-  '245': [
-  // Blah! Also "$a = $b" and "$a ; $b" can be valid... But ' :' is better than nothing, I guess...
-  {
-    'code': 'a',
-    'followedBy': 'b',
-    'add': ' :',
-    'context': defaultNeedsPuncAfter
-  }, {
-    'code': 'abk',
-    'followedBy': 'f',
-    'add': ',',
-    'context': defaultNeedsPuncAfter
-  }, {
-    'code': 'abfnp',
-    'followedBy': 'c',
-    'add': ' /',
-    'context': defaultNeedsPuncAfter
-  }, {
-    'code': 'abc',
-    'followedBy': '#',
-    'add': '.',
-    'context': defaultNeedsPuncAfter
-  } // Stepping on punctuation/ toes
-  ],
-
+  '245': add245,
+  '246': add246,
   '260': [{
     'code': 'a',
     'followedBy': 'b',
@@ -582,7 +620,8 @@ const addPairedPunctuationRules = {
   '710': addX10,
   '800': addX00,
   '810': addX10,
-  '830': addSeriesTitle
+  '830': addSeriesTitle,
+  '946': add246
 };
 function ruleAppliesToSubfieldCode(targetSubfieldCodes, currSubfieldCode) {
   const negation = targetSubfieldCodes.includes('!');
@@ -699,12 +738,13 @@ function subfieldFixPunctuation(field, subfield1, subfield2) {
   applyPunctuationRules(field, subfield1, subfield2, addPairedPunctuationRules, ADD);
 }
 function subfieldStripPunctuation(field, subfield1, subfield2) {
-  (0, _utils.nvdebug)(`FSP1: '${subfield1.value}'`);
+  //nvdebug(`FSP1: '${subfield1.value}'`);
   applyPunctuationRules(field, subfield1, subfield2, cleanValidPunctuationRules, REMOVE);
-  (0, _utils.nvdebug)(`FSP2: '${subfield1.value}'`);
+  //nvdebug(`FSP2: '${subfield1.value}'`);
   applyPunctuationRules(field, subfield1, subfield2, cleanCrappyPunctuationRules, REMOVE);
-  (0, _utils.nvdebug)(`FSP3: '${subfield1.value}'`);
+  //nvdebug(`FSP3: '${subfield1.value}'`);
 }
+
 function fieldStripPunctuation(field) {
   if (!field.subfields) {
     return field;