@natlibfi/marc-record-validators-melinda 12.0.0-alpha.7 → 12.0.0-alpha.9

package/dist/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/utils.js"],
-  "sourcesContent": ["import createDebugLogger from 'debug';\n\n//import fs from 'fs';\n//import path from 'path';\n\nconst debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:utils');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nimport {melindaFieldSpecs} from './melindaCustomMergeFields.js';\n\n//JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'src', 'melindaCustomMergeFields.json'), 'utf8'));\n\nexport function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.length > 0 && f337s.some(f => fieldHasSubfield(f, 'b', 'c') && fieldHasSubfield(f, '2', 'rdamedia'));\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) {\n    func(message);\n  }\n  //console.info(message); // eslint-disable-line no-console\n}\n\nexport function fieldHasSubfield(field, subfieldCode, subfieldValue = null) {\n  if (!field.subfields) {\n    return false;\n  }\n  if (subfieldValue === null) {\n    return field.subfields.some(sf => sf.code === subfieldCode);\n  }\n  return field.subfields.some(sf => sf.code === subfieldCode && subfieldValue === sf.value);\n}\n\nexport function subfieldToString(sf) {\n  if (!sf.value) {\n    return `\u2021${sf.code}`;\n  }\n  return `\u2021${sf.code} ${sf.value}`;\n}\n\nfunction normalizeIndicatorValue(val) {\n  if (val === ' ') {\n    return '#';\n  }\n  return val;\n}\n\nexport function recordToString(record) {\n  const ldr = `LDR   ${record.leader}`;\n  const fields = record.fields.map(f => fieldToString(f));\n  return `${ldr}\\n${fields.join('\\n')}`;\n}\n\nexport function removeSubfield(record, tag, subfieldCode) {\n  record.fields = record.fields.map(field => {\n    if (field.tag !== tag || !field.subfields) { // Don't procss irrelevant fields\n      return field;\n    }\n    field.subfields = field.subfields.filter(sf => sf.code !== subfieldCode);\n    if (field.subfields.length === 0) {\n      return false;\n    }\n    return field;\n  }).filter(field => field);\n}\n\nexport function recordRemoveValuelessSubfields(record) {\n  record.fields = record.fields.map(field => {\n    if (!field.subfields) { // Keep control fields\n      return field;\n    }\n    // Remove empty subfields from datafields:\n    field.subfields = field.subfields.filter(sf => sf.value);\n\n    if (field.subfields && field.subfields.length === 0) {\n      return false; // Return false instead of a field if field has no subfields left. These will soon be filtered out.\n    }\n\n    return field; //if field has subfields return it\n  }).filter(field => field); // Filter those falses out\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(f.ind2)}${formatSubfields(f)}`;\n  }\n  return `${f.tag}    ${f.value}`;\n\n  function formatSubfields(field) {\n    return field.subfields.map(sf => ` ${subfieldToString(sf)}`).join('');\n  }\n}\n\nexport function fieldsToString(fields) {\n  return fields.map(f => fieldToString(f)).join('\\t__SEPARATOR__\\t');\n}\n\nexport function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {\n  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));\n}\n\nexport function isControlSubfieldCode(subfieldCode) {\n  if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {\n    return true;\n  }\n  return false;\n}\n\nexport function getCatalogingLanguage(record, defaultCatalogingLanguage = undefined) {\n  const [field040] = record.get(/^040$/u);\n  if (!field040) {\n    return defaultCatalogingLanguage;\n  }\n  const [b] = field040.subfields.filter(sf => sf.code === 'b');\n  if (!b) {\n    return defaultCatalogingLanguage;\n  }\n  return b.value;\n}\n\n\nexport function uniqArray(arr) {\n  return arr.filter((val, i) => arr.indexOf(val) === i);\n}\n\nexport function fieldsAreIdentical(field1, field2) {\n  if (field1.tag !== field2.tag) { // NB! We are skipping normalizations here on purpose! They should be done beforehand...\n    return false;\n  }\n  return fieldToString(field1) === fieldToString(field2);\n\n  // The order of subfields is relevant! Bloody JS idiotisms make people use conditions such as:\n  // return field1.subfields.every(sf => field2.subfields.some(sf2 => sf.code === sf2.code && sf.value === sf2.value));\n}\n\nexport function fieldHasNSubfields(field, subfieldCode/*, subfieldValue = null*/) {\n  const relevantSubfields = field.subfields.filter(sf => sf.code === subfieldCode);\n  //if (subfieldValue === null) {\n  return relevantSubfields.length;\n  //}\n  //const subset = relevantSubfields.filter(value => value === subfieldValue);\n  //return subset.length;\n}\n\nexport function removeCopyright(value) {\n  return value.replace(/^(?:c|p|\u00A9|\u2117|Cop\\. ?) ?((?:1[0-9][0-9][0-9]|20[012][0-9])\\.?)$/ui, '$1');\n}\n\nfunction isNonStandardNonrepeatableSubfield(tag, subfieldCode) {\n  // Put these into config or so...\n  if (tag === '264') {\n    return ['a', 'b', 'c'].includes(subfieldCode);\n  }\n\n  if (['336', '337', '338'].includes(tag)) {\n    return ['a', 'b', '2'].includes(subfieldCode);\n  }\n\n  return false;\n}\n\n\nexport function subfieldIsRepeatable(tag, subfieldCode) {\n\n  if (isNonStandardNonrepeatableSubfield(tag, subfieldCode)) {\n    return false;\n  }\n\n  // These we know or \"know\":\n  // NB! $5 is (according to MARC21 format) non-repeatable, and not usable in all fields, but Melinda has a local exception to this, see MET-300\n  if ('0159'.indexOf(subfieldCode) > -1) {\n    // Uh, can $0 appear on any field?\n    return true;\n  }\n\n  const fieldSpecs = melindaFieldSpecs.fields.filter(field => field.tag === tag);\n  if (fieldSpecs.length !== 1) {\n    nvdebug(` WARNING! Getting field ${tag} data failed! ${fieldSpecs.length} hits. Default value true is used for'${subfieldCode}' .`, debugDev);\n    return true;\n  }\n\n  const subfieldSpecs = fieldSpecs[0].subfields.filter(subfield => subfield.code === subfieldCode);\n  // Currently we don't support multiple $6 fields due to re-indexing limitations...\n  // Well, $6 is non-repeatable, isn't it?!?\n  // (This might actually already be fixed... Marginal issue, but check eventually.)\n  if (subfieldSpecs.length !== 1 || subfieldCode === '6') {\n    return false; // repeatable if not specified, I guess. Maybe add log or warn?\n  }\n  return subfieldSpecs[0].repeatable;\n}\n\nfunction marc21GetTagsLegalIndicators(tag) {\n  const fieldSpecs = melindaFieldSpecs.fields.filter(field => field.tag === tag);\n  if (fieldSpecs.length === 0) {\n    return undefined;\n  }\n  return fieldSpecs[0].indicators;\n}\n\nexport function marc21GetTagsLegalInd1Value(tag) {\n  const indicator = marc21GetTagsLegalIndicators(tag);\n  if (indicator === undefined) {\n    return undefined;\n  }\n  return indicator.ind1;\n}\n\nexport function marc21GetTagsLegalInd2Value(tag) {\n  const indicator = marc21GetTagsLegalIndicators(tag);\n  if (indicator === undefined) {\n    return undefined;\n  }\n  return indicator.ind2;\n}\n\nexport function nvdebugSubfieldArray(subfields, prefix = '  ', func = undefined) {\n  subfields.forEach(subfield => nvdebug(`${prefix}${subfieldToString(subfield)}`, func));\n}\n\nexport function subfieldsAreIdentical(subfieldA, subfieldB) {\n  return subfieldA.code === subfieldB.code && subfieldA.value === subfieldB.value;\n}\n\nexport function fieldHasMultipleSubfields(field, subfieldCode/*, subfieldValue = null*/) {\n  return fieldHasNSubfields(field, subfieldCode) > 1;\n}\n\nexport function hasCopyright(value) {\n  const modValue = removeCopyright(value);\n  return value !== modValue;\n}\n\n\n\nexport function subfieldArraysContainSameData(arr1, arr2) {\n  if ( !arr1.every(sf => arr2.some(sf2 => subfieldsAreIdentical(sf, sf2))) ) {\n    return false;\n  }\n\n  return arr2.every(sf2 => arr1.some(sf => subfieldsAreIdentical(sf, sf2)));\n}"],
-  "mappings": "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",
+  "sourcesContent": ["import createDebugLogger from 'debug';\n\n//import fs from 'fs';\n//import path from 'path';\n\nconst debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:utils');\n//const debugData = debug.extend('data');\nconst debugDev = debug.extend('dev');\n\nimport {melindaFieldSpecs} from './melindaCustomMergeFields.js';\n\n//JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'src', 'melindaCustomMergeFields.json'), 'utf8'));\n\nexport function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.length > 0 && f337s.some(f => fieldHasSubfield(f, 'b', 'c') && fieldHasSubfield(f, '2', 'rdamedia'));\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) {\n    func(message);\n  }\n  //console.info(message); // eslint-disable-line no-console\n}\n\nexport function fieldHasSubfield(field, subfieldCode, subfieldValue = null) {\n  if (!field.subfields) {\n    return false;\n  }\n  if (subfieldValue === null) {\n    return field.subfields.some(sf => sf.code === subfieldCode);\n  }\n  return field.subfields.some(sf => sf.code === subfieldCode && subfieldValue === sf.value);\n}\n\nexport function subfieldToString(sf) {\n  if (!sf.value) {\n    return `\u2021${sf.code}`;\n  }\n  return `\u2021${sf.code} ${sf.value}`;\n}\n\nfunction normalizeIndicatorValue(val) {\n  if (val === ' ') {\n    return '#';\n  }\n  return val;\n}\n\nexport function recordToString(record) {\n  const ldr = `LDR   ${record.leader}`;\n  const fields = record.fields.map(f => fieldToString(f));\n  return `${ldr}\\n${fields.join('\\n')}`;\n}\n\nexport function removeSubfield(record, tag, subfieldCode) {\n  record.fields = record.fields.map(field => {\n    if (field.tag !== tag || !field.subfields) { // Don't procss irrelevant fields\n      return field;\n    }\n    field.subfields = field.subfields.filter(sf => sf.code !== subfieldCode);\n    if (field.subfields.length === 0) {\n      return false;\n    }\n    return field;\n  }).filter(field => field);\n}\n\nexport function recordRemoveValuelessSubfields(record) {\n  record.fields = record.fields.map(field => {\n    if (!field.subfields) { // Keep control fields\n      return field;\n    }\n    // Remove empty subfields from datafields:\n    field.subfields = field.subfields.filter(sf => sf.value);\n\n    if (field.subfields && field.subfields.length === 0) {\n      return false; // Return false instead of a field if field has no subfields left. These will soon be filtered out.\n    }\n\n    return field; //if field has subfields return it\n  }).filter(field => field); // Filter those falses out\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(f.ind2)}${formatSubfields(f)}`;\n  }\n  return `${f.tag}    ${f.value}`;\n\n  function formatSubfields(field) {\n    return field.subfields.map(sf => ` ${subfieldToString(sf)}`).join('');\n  }\n}\n\nexport function fieldsToString(fields) {\n  return fields.map(f => fieldToString(f)).join('\\t__SEPARATOR__\\t');\n}\n\nexport function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {\n  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));\n}\n\nexport function isControlSubfieldCode(subfieldCode) {\n  // NB! Only $w, $0, $1, $5, $6 and $8 are really control subfields. In Finland $9 is oft a control subfield\n  // $3 material (part of the whole thing)\n  // $4 means 'relationship' (similar to relator terms at least in X00 and similar)\n  // $7 is usually provinance subfield. However, it can be stored in other subfields as well. See merge-fields/dataProvenance.js for details\n  // However, change this only if needed. Maybe all provinance subfields should return true?\n  // This may become relevant when AI starts to create stuff...\n  if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {\n    return true;\n  }\n  return false;\n}\n\nexport function getCatalogingLanguage(record, defaultCatalogingLanguage = undefined) {\n  const [field040] = record.get(/^040$/u);\n  if (!field040) {\n    return defaultCatalogingLanguage;\n  }\n  const [b] = field040.subfields.filter(sf => sf.code === 'b');\n  if (!b) {\n    return defaultCatalogingLanguage;\n  }\n  return b.value;\n}\n\n\nexport function uniqArray(arr) {\n  return arr.filter((val, i) => arr.indexOf(val) === i);\n}\n\nexport function fieldsAreIdentical(field1, field2) {\n  if (field1.tag !== field2.tag) { // NB! We are skipping normalizations here on purpose! They should be done beforehand...\n    return false;\n  }\n  return fieldToString(field1) === fieldToString(field2);\n\n  // The order of subfields is relevant! Bloody JS idiotisms make people use conditions such as:\n  // return field1.subfields.every(sf => field2.subfields.some(sf2 => sf.code === sf2.code && sf.value === sf2.value));\n}\n\nexport function fieldHasNSubfields(field, subfieldCode/*, subfieldValue = null*/) {\n  const relevantSubfields = field.subfields.filter(sf => sf.code === subfieldCode);\n  //if (subfieldValue === null) {\n  return relevantSubfields.length;\n  //}\n  //const subset = relevantSubfields.filter(value => value === subfieldValue);\n  //return subset.length;\n}\n\nexport function removeCopyright(value) {\n  return value.replace(/^(?:c|p|\u00A9|\u2117|Cop\\. ?) ?((?:1[0-9][0-9][0-9]|20[012][0-9])\\.?)$/ui, '$1');\n}\n\nfunction isNonStandardNonrepeatableSubfield(tag, subfieldCode) {\n  // Put these into config or so...\n  if (tag === '264') {\n    return ['a', 'b', 'c'].includes(subfieldCode);\n  }\n\n  if (['336', '337', '338'].includes(tag)) {\n    return ['a', 'b', '2'].includes(subfieldCode);\n  }\n\n  return false;\n}\n\n\nexport function subfieldIsRepeatable(tag, subfieldCode) {\n\n  if (isNonStandardNonrepeatableSubfield(tag, subfieldCode)) {\n    return false;\n  }\n\n  // These we know or \"know\":\n  // NB! $5 is (according to MARC21 format) non-repeatable, and not usable in all fields, but Melinda has a local exception to this, see MET-300\n  if ('0159'.indexOf(subfieldCode) > -1) {\n    // Uh, can $0 appear on any field?\n    return true;\n  }\n\n  const fieldSpecs = melindaFieldSpecs.fields.filter(field => field.tag === tag);\n  if (fieldSpecs.length !== 1) {\n    nvdebug(` WARNING! Getting field ${tag} data failed! ${fieldSpecs.length} hits. Default value true is used for'${subfieldCode}' .`, debugDev);\n    return true;\n  }\n\n  const subfieldSpecs = fieldSpecs[0].subfields.filter(subfield => subfield.code === subfieldCode);\n  // Currently we don't support multiple $6 fields due to re-indexing limitations...\n  // Well, $6 is non-repeatable, isn't it?!?\n  // (This might actually already be fixed... Marginal issue, but check eventually.)\n  if (subfieldSpecs.length !== 1 || subfieldCode === '6') {\n    return false; // repeatable if not specified, I guess. Maybe add log or warn?\n  }\n  return subfieldSpecs[0].repeatable;\n}\n\nfunction marc21GetTagsLegalIndicators(tag) {\n  const fieldSpecs = melindaFieldSpecs.fields.filter(field => field.tag === tag);\n  if (fieldSpecs.length === 0) {\n    return undefined;\n  }\n  return fieldSpecs[0].indicators;\n}\n\nexport function marc21GetTagsLegalInd1Value(tag) {\n  const indicator = marc21GetTagsLegalIndicators(tag);\n  if (indicator === undefined) {\n    return undefined;\n  }\n  return indicator.ind1;\n}\n\nexport function marc21GetTagsLegalInd2Value(tag) {\n  const indicator = marc21GetTagsLegalIndicators(tag);\n  if (indicator === undefined) {\n    return undefined;\n  }\n  return indicator.ind2;\n}\n\nexport function nvdebugSubfieldArray(subfields, prefix = '  ', func = undefined) {\n  subfields.forEach(subfield => nvdebug(`${prefix}${subfieldToString(subfield)}`, func));\n}\n\nexport function subfieldsAreIdentical(subfieldA, subfieldB) {\n  return subfieldA.code === subfieldB.code && subfieldA.value === subfieldB.value;\n}\n\nexport function fieldHasMultipleSubfields(field, subfieldCode/*, subfieldValue = null*/) {\n  return fieldHasNSubfields(field, subfieldCode) > 1;\n}\n\nexport function hasCopyright(value) {\n  const modValue = removeCopyright(value);\n  return value !== modValue;\n}\n\n\n\nexport function subfieldArraysContainSameData(arr1, arr2) {\n  if ( !arr1.every(sf => arr2.some(sf2 => subfieldsAreIdentical(sf, sf2))) ) {\n    return false;\n  }\n\n  return arr2.every(sf2 => arr1.some(sf => subfieldsAreIdentical(sf, sf2)));\n}"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -14,7 +14,7 @@
     "url": "https://github.com/NatLibFi/marc-record-validators-melinda"
   },
   "license": "MIT",
-  "version": "12.0.0-alpha.7",
+  "version": "12.0.0-alpha.9",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -33,19 +33,20 @@
     "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test"
   },
   "dependencies": {
+    "@natlibfi/iso9-1995": "next",
     "@natlibfi/issn-verify": "^1.0.6",
     "@natlibfi/marc-record": "next",
     "@natlibfi/marc-record-serializers": "next",
     "@natlibfi/marc-record-validate": "next",
     "@natlibfi/melinda-commons": "next",
     "@natlibfi/sfs-4900": "next",
-    "@natlibfi/iso9-1995": "next",
     "@natlibfi/sru-client": "next",
     "cld3-asm": "^4.0.0",
     "clone": "^2.1.2",
     "debug": "^4.4.3",
-    "isbn3": "^1.2.15",
+    "isbn3": "^2.0.0",
     "langs": "^2.0.0",
+    "undici": "^7.16.0",
     "xml2js": "^0.6.2",
     "xregexp": "^5.1.2"
   },
@@ -56,12 +57,12 @@
     "@natlibfi/fixugen": "next",
     "@natlibfi/fixura": "next",
     "cross-env": "^10.0.0",
-    "esbuild": "^0.25.10",
-    "eslint": "^9.36.0",
-    "fetch-mock": "^12.5.4"
+    "esbuild": "^0.25.12",
+    "eslint": "^9.39.1",
+    "fetch-mock": "^12.6.0"
   },
   "overrides": {
     "nanoid": "^3.3.8"
   },
-  "nvolkComment": "cld3-asm 4.0.0 uses emscripten-wasm-loader ^3.0.3 which uses problematic, non-secure nanoid version 2.X.X"
+  "nvolkComment": "cld3-asm 4.0.0 uses emscripten-wasm-loader ^3.0.3 which uses problematic, non-secure nanoid version 2.X.X. Isbn3 has breaking changes in 1.2.16-18 at least."
 }

package/src/ending-punctuation-conf.js

@@ -1,7 +1,7 @@
 // Const finnishTerms = ['ysa', 'yso', 'kassu', 'seko', 'valo', 'kulo', 'puho', 'oiko', 'mero', 'liito', 'fast', 'allars', 'kaunokki'];
 const finnishTerms = [
   /^(?:allars|bella|fast|juho|jupo|kassu|kauno|kaunokki|keko|koko|kulo|liiko|liito|local|mero|mts|musa|oiko|puho|seko|woto|valo|ysa|yso)$/u,
-  /^(?:kauno|slm|yso)\//u
+  /^(?:kauno|slm|yso)\//u // <= yso/* etc
 ];
 
 const validPuncMarks = '?-!.'; // NB! ')' and ']' are only valid for some fields!
@@ -501,7 +501,7 @@ const confSpec = [
     index: null,
     punc: false,
     special: {
-      termField: '2',
+      termSubfieldCode: '2',
       finnishTerms,
       else: true
     }
@@ -517,7 +517,7 @@ const confSpec = [
     index: null,
     punc: false,
     special: {
-      termField: '2',
+      termSubfieldCode: '2',
       finnishTerms,
       else: true
     }

package/src/ending-punctuation.js

@@ -65,12 +65,6 @@ export default function () {
 
 // Field validation with punctuation rules for normal and special cases in subfunction (to reduce complexity to please travisci)
 function validateField(field, linkedTag, fix, message) {
-  // This is used to find last subfield that should have punctuation
-  function findLastSubfield(field) {
-    const subfields = field.subfields.filter(sf => isNaN(sf.code) && 'value' in sf);
-    return subfields.slice(-1).shift();
-  }
-
   function getDefaultPuncMarks(tag) {
     if (tag.match(/^[1678](?:00|10|11|30)/u) || tag === '740') { // As defined in Loppupisteohje
       return `${validPuncMarks})`;
@@ -98,7 +92,7 @@ function validateField(field, linkedTag, fix, message) {
 
     // Last char should be punc, but it's not one of listed punctuation marks nor dot
     if (punc && !(lastPuncMark || lastPuncDot)) {
-      console.log(puncMarks)
+      //console.log(puncMarks)
       if (penultimateCharacter && validQuoteChars.includes(lastChar) && puncMarks.includes(penultimateCharacter)) {
         // Exception: do nothing! Ending in punc+quote combo is all right, and does not imply a missing punc
       }
@@ -189,12 +183,17 @@ function validateField(field, linkedTag, fix, message) {
       normalPuncRules(lastSubField, res.punc, tag, false, false);
 
       // Search for Finnish terms
-    } else if (res.special.termField) {
+    } else if (res.special.termSubfieldCode) {
       lastSubField = findLastSubfield(field);
 
       if (lastSubField) {
-        const languageField = field.subfields.find(({code}) => code === res.special.termField);
-        if (languageField && languageField.value && finnishTerms.some(p => p.test(languageField.value))) {
+        const lexicon = getLexicon(field, res.special.termSubfieldCode);
+        const proceed = !finnishException(field, res.special.termSubfieldCode, false);
+
+
+        //const languageField = field.subfields.find(({code}) => code === res.special.termSubfieldCode);
+        //if (languageField && languageField.value && finnishTerms.some(p => p.test(languageField.value))) {
+        if (lexicon && finnishTerms.some(p => p.test(lexicon)) && proceed) {
           // If (languageField && languageField.value && finnishTerms.indexOf(languageField.value) > -1) {
           normalPuncRules(lastSubField, res.punc, tag, true, false);
         } else {
@@ -272,8 +271,12 @@ function validateField(field, linkedTag, fix, message) {
     return;
   }
 
+  const forceNormal = res.special ? finnishException(field, res.special.termSubfieldCode, true) : false;
   // Normal rules
-  if (typeof res.special === 'undefined' || res.special === null) {
+  if (typeof res.special === 'undefined' || res.special === null || forceNormal) {
+    if (forceNormal) {
+      console.info("EXCEPTION. SKIP FINNISH RULES");
+    }
     lastSubField = findLastSubfield(field);
 
     if (lastSubField) {
@@ -300,3 +303,51 @@ export function validateSingleField(field, linkedTag, fix) {
   return message;
 }
 
+function getLexicon(field, subfieldCode) {
+  const languageSubfield = field.subfields.find(({code}) => code === subfieldCode); // res.special.termSubfieldCode);
+  if (!languageSubfield || !languageSubfield.value) {
+    return undefined;
+  }
+  if (finnishTerms.find(p => p.test(languageSubfield.value))) {
+    return languageSubfield.value;
+  }
+  return undefined;
+}
+
+function finnishException(field, termSubfieldCode, hasDot = true) {
+  const lexicon = getLexicon(field, termSubfieldCode);
+  if (!lexicon) {
+    return false;
+  }
+
+  const lastSubfield = findLastSubfield(field);
+  if (!lastSubfield || !lastSubfield.value) {
+    return false;
+  }
+  // Some terms can end in '.' that we want to keep
+  if (field.tag === '648') { // Yso-aika checks
+    //console.log(`Finnish Exception? '${lastSubfield.value}', '${lexicon}', '${field.tag}'`);
+    if (lexicon === 'yso/fin') { // 'eaa.' appears in prefLAbels and 'eKr.' in altLabels
+      if (hasDot) {
+        return lastSubfield.value.match(/ (?:eaa|[ej]Kr|jaa)\.$/u); // Finnish term from which the dot is not to be removed
+      }
+      return lastSubfield.value.match(/ (?:eaa|[ej]Kr)|jaa$/u); // Finnish word that needs a dot
+    }
+
+    if (lexicon === 'yso/swe') {
+      if (hasDot) {
+        return lastSubfield.value.match(/ (?:[ef]\.Kr|f\.v\.t)\.$/u);
+      }
+      return lastSubfield.value.match(/ (?:[ef]\.Kr|f\.v\.t)$/u);
+    }
+  }
+  // yso has 'MODEL.LA.' and 'Corel R.A.V.E.' but these are so rare I'm not listing them
+
+  return false;
+}
+
+  // This is used to find last subfield that should have punctuation
+  function findLastSubfield(field) {
+    const subfields = field.subfields.filter(sf => isNaN(sf.code) && 'value' in sf);
+    return subfields.slice(-1).shift();
+  }

package/src/ending-punctuation.test.js

@@ -1585,7 +1585,7 @@ describe('ending-punctuation', () => {
         ]
       });
 
-      const recordVali648dFinNo = new MarcRecord({
+      const recordValid648FinNo = new MarcRecord({
         leader: '',
         fields: [
           {
@@ -1596,6 +1596,16 @@ describe('ending-punctuation', () => {
               {code: 'a', value: '1900-luku'},
               {code: '2', value: 'yso/swe'}
             ]
+          },
+          { // Exception: term ending in dot:
+            tag : '648',
+            ind1: ' ',
+            ind2: '7',
+            subfields: [
+              {code: 'a', value: '1200-luku eaa.'},
+              {code: '2', value: 'yso/fin'},
+              {code: '0', value: 'http://www.yso.fi/onto/yso/p1129911200'}
+            ]
           }
         ]
       });
@@ -1668,7 +1678,7 @@ describe('ending-punctuation', () => {
 
       it('Finds record valid - 648 Finnish, without punc', async () => {
         const validator = await validatorFactory();
-        const result = await validator.validate(recordVali648dFinNo);
+        const result = await validator.validate(recordValid648FinNo);
         assert.equal(result.valid, true);
       });
 
@@ -1713,7 +1723,7 @@ describe('ending-punctuation', () => {
         ]
       });
 
-      const recordInvali648dFinYes = new MarcRecord({
+      const recordInvalid648FinYes = new MarcRecord({
         leader: '',
         fields: [
           {
@@ -1724,6 +1734,15 @@ describe('ending-punctuation', () => {
               {code: 'a', value: '1900-luku.'},
               {code: '2', value: 'yso/swe'}
             ]
+          }, { // Exception:
+            tag: '648',
+            ind1: ' ',
+            ind2: '7',
+            subfields: [
+              {code: 'a', value: '1200-luku eaa'},
+              {code: '2', value: 'yso/fin'},
+              {code: '0', value: 'http://www.yso.fi/onto/yso/p1129911200'}
+            ]
           }
         ]
       });
@@ -1799,9 +1818,9 @@ describe('ending-punctuation', () => {
 
       it('Finds record invalid - 648 Finnish, with punc', async () => {
         const validator = await validatorFactory();
-        const result = await validator.validate(recordInvali648dFinYes);
+        const result = await validator.validate(recordInvalid648FinYes);
         assert.deepEqual(result, {
-          message: ['Field 648 has unwanted ending punctuation \'.\''],
+          message: ['Field 648 has unwanted ending punctuation \'.\'', "Field 648 requires ending punctuation, ends in 'a'"],
           valid: false
         });
       });
@@ -1857,11 +1876,16 @@ describe('ending-punctuation', () => {
 
       it('Repairs the invalid record - 648 Finnish, removes punc $a', async () => {
         const validator = await validatorFactory();
-        const result = await validator.fix(recordInvali648dFinYes);
-        assert.equal(recordInvali648dFinYes.equalsTo(recordVali648dFinNo), true);
+        const result = await validator.fix(recordInvalid648FinYes);
+        //console.info("NV-------");
+        //console.info(JSON.stringify(recordInvalid648FinYes));
+        //console.info(JSON.stringify(recordValid648FinNo));
+        //assert.equal(recordInvalid648FinYes.equalsTo(recordValid648FinNo), true);
+        assert.deepEqual(recordInvalid648FinYes, recordValid648FinNo);
+        //console.info(JSON.stringify(result));
         assert.deepEqual(result, {
-          message: ['Field 648 has unwanted ending punctuation \'.\''],
-          fix: ['Field 648 - Removed punctuation from $a'],
+          message: ['Field 648 has unwanted ending punctuation \'.\'', "Field 648 requires ending punctuation, ends in 'a'"],
+          fix: ['Field 648 - Removed punctuation from $a', 'Field 648 - Added punctuation to $a'],
           valid: false
         });
       });

package/src/indicator-fixes.js

@@ -171,6 +171,18 @@ function normalize245Indicator1(field, record) {
   field.ind1 = field1XX.length === 0 ? '0' : '1';
 }
 
+function noDisplayConstantGenerated520Indicator1(field) {
+  if (field.tag !== '520') {
+    return;
+  }
+  const as = field.subfields.filter(sf => sf.code === 'a');
+  // Set ind1=8 "no display constant generated" fro certain values (part of MELKEHITYS-2579):
+  if (as.length === 1 && ['Abstract.', 'Abstrakt.', 'Abstrakti.', 'Abstract.', 'English Summary.', 'Sammandrag.', 'Tiivistelmä.'].includes(field.subfields[0].value)) {
+    field.ind1 = '8';
+  }
+
+}
+
 function normalize776Indicator2(field) {
   if (field.tag !== '776') {
     return;
@@ -242,6 +254,7 @@ function recordNormalizeIndicators(record) {
 function fieldNormalizeIndicators(field, record, languages) {
   normalize084Indicator1(field);
   normalize245Indicator1(field, record);
+  noDisplayConstantGenerated520Indicator1(field);
   normalizeNonFilingIndicator1(field, languages);
   normalizeNonFilingIndicator2(field, languages);
   normalize776Indicator2(field);

package/src/isbn-issn.js

@@ -29,8 +29,14 @@ export default ({hyphenateISBN = false, handleInvalid = false} = {}) => {
 
   function invalidISBN(isbn) {
     const isbnOnly = getFirstWord(isbn);
-    const auditedIsbn = ISBN.audit(isbnOnly);
-    return !auditedIsbn.validIsbn;
+    try {
+      const auditedIsbn = ISBN.audit(isbnOnly);
+      return !auditedIsbn.validIsbn;
+    }
+    catch {
+      return true;
+    }
+
   }
 
   function invalidSubfield(subfield) {
@@ -238,9 +244,8 @@ export default ({hyphenateISBN = false, handleInvalid = false} = {}) => {
       function normalizeIsbnValue(value) {
         const trimmedValue = getFirstWord(value);
         //const trimmedValue = trimISBN(value); // NB! This might lose information that should be stored in $q...
-        const auditResult = ISBN.audit(trimmedValue);
-        if (!auditResult.validIsbn) {
-          return undefined;
+        if (invalidISBN(trimmedValue)) {
+          return undefined; // should this return value (= nothing normalized), not undefined?
         }
         const numbersOnly = trimmedValue.replace(/[^0-9Xx]+/ug, '');
         const parsedIsbn = ISBN.parse(trimmedValue);

package/src/merge-fields/dataProvenance.js

@@ -2,7 +2,7 @@
 
 import {subfieldArraysContainSameData} from "../utils.js";
 
-function tagToDataProvenanceSubfieldCode(tag) {
+export function tagToDataProvenanceSubfieldCode(tag) {
     if ( ['533', '800', '810', '811', '830'].includes(tag)) {
         return 'y';
     }

package/src/punctuation2.js

@@ -10,9 +10,10 @@
 *          (They are jumped over when looking for next (non-controlfield subfield)
 */
 import {validateSingleField} from './ending-punctuation.js';
+import {tagToDataProvenanceSubfieldCode} from './merge-fields/dataProvenance.js';
 import {fieldGetUnambiguousTag} from './subfield6Utils.js';
 //import createDebugLogger from 'debug';
-import {fieldToString, nvdebug} from './utils.js';
+import {fieldToString, isControlSubfieldCode, nvdebug} from './utils.js';
 import clone from 'clone';
 
 //const debug = createDebugLogger('debug/punctuation2');
@@ -49,12 +50,19 @@ export default function () {
   }
 }
 
-function isControlSubfield(subfield) {
-  return ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].includes(subfield.code);
+
+
+function isIrrelevantSubfield(subfield, tag) {
+  const dataProvenanceSubfieldCode = tagToDataProvenanceSubfieldCode(tag);
+  if (subfield.code === dataProvenanceSubfieldCode) {
+    return true;
+  }
+  return isControlSubfieldCode(subfield.code); // Currently this contains other stuff as well ($3, $4, $7, $9...)
 }
 
+
 function getNextRelevantSubfield(field, currSubfieldIndex) {
-  return field.subfields.find((subfield, index) => index > currSubfieldIndex && !isControlSubfield(subfield));
+  return field.subfields.find((subfield, index) => index > currSubfieldIndex && !isIrrelevantSubfield(subfield, field.tag));
 }
 
 export function fieldGetFixedString(field, add = true) {
@@ -155,7 +163,8 @@ const remove490And830Whatever = [{'code': 'axyzv', 'followedBy': 'axyzv', 'remov
 const linkingEntryRemoveWhatever = [
   {'code': 'i', 'followedBy': 'at', 'remove': / ?:$/u}, // ':'
   {'code': 'at', 'remove': /\.$/u},
-  {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz', 'remove': /\. -$/u}
+  // Only ". -" separator is still used in music. We can strip it, but can only create the non-music punctuation!
+  {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz#', 'remove': /\. -$/u}
 ];
 
 

package/src/translate-terms.test.js

@@ -1,9 +1,23 @@
 import assert from 'node:assert';
-import {MarcRecord} from '@natlibfi/marc-record';
+import createDebugLogger from 'debug';
+import fetchMock from 'fetch-mock';
+
 import validatorFactory from './translate-terms.js';
+
+import {MarcRecord} from '@natlibfi/marc-record';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
+import {fakeData} from '../test-fixtures/translate-terms-data.js';
+
+const uris = [
+  'http://www.yso.fi/onto/yso/p13299',
+  'http://www.yso.fi/onto/yso/p111739',
+  'http://www.yso.fi/onto/yso/p6197061979',
+  'http://www.yso.fi/onto/yso/p6196061969',
+  'http://urn.fi/URN:NBN:fi:au:slm:s161'
+];
+
+
 
 generateTests({
   callback,
@@ -15,6 +29,15 @@ generateTests({
   },
   hooks: {
     before: async () => {
+
+      fetchMock.mockGlobal()
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[0]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[1]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[2]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[3]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData})
+      .get(`https://api.finto.fi/rest/v1/data?uri=${uris[4]}&format=application%2Fjson`, {status: 200, headers: {}, body: fakeData});
+
+
       testValidatorFactory();
     }
   }

package/src/utils.js

@@ -103,6 +103,12 @@ export function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {
 }
 
 export function isControlSubfieldCode(subfieldCode) {
+  // NB! Only $w, $0, $1, $5, $6 and $8 are really control subfields. In Finland $9 is oft a control subfield
+  // $3 material (part of the whole thing)
+  // $4 means 'relationship' (similar to relator terms at least in X00 and similar)
+  // $7 is usually provinance subfield. However, it can be stored in other subfields as well. See merge-fields/dataProvenance.js for details
+  // However, change this only if needed. Maybe all provinance subfields should return true?
+  // This may become relevant when AI starts to create stuff...
   if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {
     return true;
   }

package/test-fixtures/indicator-fixes/10/expectedResult.json

@@ -0,0 +1,11 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    { "tag": "005", "value": "20220202020202.0" },
+    { "tag": "520", "ind1": "8", "ind2": " ", "subfields": [ {"code": "a", "value": "Abstrakti."}, {"code": "9", "value": "TESTI<KEEP>"} ]},
+    { "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Whatever."}]},
+    { "tag": "520", "ind1": "8", "ind2": " ", "subfields": [ {"code": "a", "value": "Tiivistelmä."}]}
+
+  ],
+  "leader": ""
+}

package/test-fixtures/indicator-fixes/10/metadata.json

@@ -0,0 +1,4 @@
+{
+  "description": "10: certain value have ind1=8 as per MELKEHITYS-2579",
+  "fix": true
+}

package/test-fixtures/indicator-fixes/10/record.json

@@ -0,0 +1,11 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    { "tag": "005", "value": "20220202020202.0" },
+    { "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Abstrakti."}, {"code": "9", "value": "TESTI<KEEP>"} ]},
+    { "tag": "520", "ind1": " ", "ind2": " ", "subfields": [ {"code": "a", "value": "Whatever."}]},
+    { "tag": "520", "ind1": "3", "ind2": " ", "subfields": [ {"code": "a", "value": "Tiivistelmä."}]}
+
+  ],
+  "leader": ""
+}

package/test-fixtures/translate-terms-data.js

@@ -0,0 +1,42 @@
+const fakeTerms = {
+    graph: [
+        {
+            uri: 'http://www.yso.fi/onto/yso/p13299',
+            prefLabel: [
+                { lang: 'fi', value: 'laiturit' },
+                { lang: 'sv', value: 'bryggor'}
+            ]
+        },
+        {
+            uri: 'http://www.yso.fi/onto/yso/p111739',
+            prefLabel: [
+                { lang: 'fi', value: 'Ivalo (Inari)' },
+                { lang: 'sv', value: 'Ivalo (Enare)'}
+            ]
+        },
+        {
+            uri: 'http://www.yso.fi/onto/yso/p6197061979',
+            prefLabel: [
+                { lang: 'fi', value: '1970-luku' },
+                { lang: 'sv', value: '1970-talet' }
+            ]
+        },
+        {
+            uri: 'http://www.yso.fi/onto/yso/p6196061969',
+            prefLabel: [
+                { lang: 'fi', value: '1960-luku' },
+                { lang: 'sv', value: '1960-talet' }
+            ]
+        },
+        {
+            uri: 'http://urn.fi/URN:NBN:fi:au:slm:s161',
+            prefLabel: [
+                { lang: 'fi', value: 'naistenlehdet' },
+                { lang: 'sv', value: 'damtidningar' }
+            ]
+        }
+    ]
+
+};
+
+export const fakeData = JSON.stringify(fakeTerms);