@natlibfi/melinda-record-matching 2.0.1 → 2.0.7-alpha.1

package/dist/matching-utils.js

@@ -3,21 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.extractSubfieldsFromField = extractSubfieldsFromField;
+exports.getMatchCounts = getMatchCounts;
 exports.getMelindaIdsF035 = getMelindaIdsF035;
 exports.getSubfieldValues = getSubfieldValues;
+exports.testStringOrNumber = testStringOrNumber;
+exports.uniqueSubfields = uniqueSubfields;
 exports.validateSidFieldSubfieldCounts = validateSidFieldSubfieldCounts;
-
 var _debug = _interopRequireDefault(require("debug"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
 *
 * @licstart  The following is the entire license notice for the JavaScript code in this file.
 *
 * Melinda record matching modules for Javascript
 *
-* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)
+* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
 *
 * This file is part of melinda-record-matching-js
 *
@@ -38,36 +39,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 * for the JavaScript code in this file.
 *
 */
-const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:utils');
-const debugData = debug.extend('data'); // eslint-disable-next-line max-statements
 
+const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:utils');
+const debugData = debug.extend('data');
 function getMelindaIdsF035(record) {
   const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:melinda-id');
   const debugData = debug.extend('data');
   const f035s = record.getFields('035');
-
   if (f035s.length < 1) {
     debug(`No f035s found.`);
     return [];
   }
-
   const allF035MelindaIds = [].concat(...f035s.map(toMelindaIds));
   const f035MelindaIds = [...new Set(allF035MelindaIds)];
   debugData(`Fields (${f035s.length}): ${JSON.stringify(f035s)}`);
   debugData(`Ids (${allF035MelindaIds.length}): ${JSON.stringify(allF035MelindaIds)}`);
   debugData(`Unique ids (${f035MelindaIds.length}): ${JSON.stringify(f035MelindaIds)}`);
   return f035MelindaIds;
-
   function toMelindaIds({
     subfields
   }) {
     const melindaIdRegExp = /^(?<prefix>\(FI-MELINDA\)|FCC)(?<id>\d{9})$/u;
-    return subfields.filter(sub => ['a', 'z'].includes(sub.code)).filter(sub => melindaIdRegExp.test(sub.value)).map(({
+    return subfields.filter(sub => ['a', 'z'].includes(sub.code)).filter(sub => testStringOrNumber(sub.value) && melindaIdRegExp.test(String(sub.value))).map(({
       value
-    }) => value.replace(melindaIdRegExp, '$<id>'));
+    }) => testStringOrNumber(value) ? String(value).replace(melindaIdRegExp, '$<id>') : '');
   }
 }
-
 function validateSidFieldSubfieldCounts(field) {
   // Valid SID-fields have just one $c and one $b
   debugData(`Validating SID field ${JSON.stringify(field)}`);
@@ -76,20 +73,71 @@ function validateSidFieldSubfieldCounts(field) {
   debug(`Found ${countC} sf $cs and ${countB} sf $bs. IsValid: ${countC === 1 && countB === 1}`);
   return countC === 1 && countB === 1;
 }
-
 function countSubfields(field, subfieldCode) {
   // debug(`Counting subfields ${subfieldCode}`);
   return field.subfields.filter(({
     code
   }) => code === subfieldCode).length;
 }
-
 function getSubfieldValues(field, subfieldCode) {
   debugData(`Get subfield(s) $${subfieldCode} from ${JSON.stringify(field)}`);
   return field.subfields.filter(({
     code
   }) => code === subfieldCode).map(({
     value
-  }) => value);
+  }) => testStringOrNumber(value) ? String(value) : '').filter(value => value);
+}
+function testStringOrNumber(value) {
+  if (typeof value === 'string' || typeof value === 'number') {
+    return true;
+  }
+  return false;
+}
+function extractSubfieldsFromField(field, subfieldCodes) {
+  if (field === undefined || field.subfields === undefined) {
+    return [];
+  }
+  const resultSubfields = field.subfields.filter(({
+    code
+  }) => subfieldCodes.includes(code)).map(({
+    code,
+    value
+  }) => ({
+    code,
+    value: testStringOrNumber(value) ? String(value) : ''
+  })).filter(value => value);
+  return resultSubfields;
+}
+function uniqueSubfields(subfields) {
+  return subfields.reduce((arr, e) => {
+    if (!arr.find(item => item.code === e.code && item.value === e.value)) {
+      const newArr = arr.concat(e);
+      return newArr;
+    }
+    return arr;
+  }, []);
+}
+function getMatchCounts(aValues, bValues) {
+  const matchingValues = getMatchingValuesAmount(aValues, bValues);
+  return {
+    maxValues: aValues.length > bValues.length ? aValues.length : bValues.length,
+    // possibleMatchingValues: amount of identifiers in set of less identifiers (we cannot more values than these)
+    possibleMatchValues: aValues.length > bValues.length ? bValues.length : aValues.length,
+    matchingValues
+  };
+  function getMatchingValuesAmount(aValues, bValues) {
+    if (bValues.length > aValues.length) {
+      return aValues.filter(aValue => bValues.some(bValue => aValue === bValue)).length;
+    }
+    if (aValues.length > bValues.length) {
+      return bValues.filter(bValue => aValues.some(aValue => bValue === aValue)).length;
+    }
+
+    // If we have same amount of values, we'll check matches both ways, to avoid mixups in cases
+    // there would be duplicate values
+    const aToB = aValues.filter(aValue => bValues.some(bValue => aValue === bValue)).length;
+    const bToA = bValues.filter(bValue => aValues.some(aValue => bValue === aValue)).length;
+    return aToB < bToA ? aToB : bToA;
+  }
 }
 //# sourceMappingURL=matching-utils.js.map

package/dist/matching-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/matching-utils.js"],"names":["debug","debugData","extend","getMelindaIdsF035","record","f035s","getFields","length","allF035MelindaIds","concat","map","toMelindaIds","f035MelindaIds","Set","JSON","stringify","subfields","melindaIdRegExp","filter","sub","includes","code","test","value","replace","validateSidFieldSubfieldCounts","field","countC","countSubfields","countB","subfieldCode","getSubfieldValues"],"mappings":"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","sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:utils');\nconst debugData = debug.extend('data');\n\n// eslint-disable-next-line max-statements\nexport function getMelindaIdsF035(record) {\n\n  const debug = createDebugLogger('@natlibfi/melinda-record-matching:melinda-id');\n  const debugData = debug.extend('data');\n\n  const f035s = record.getFields('035');\n\n  if (f035s.length < 1) {\n    debug(`No f035s found.`);\n    return [];\n  }\n\n  const allF035MelindaIds = [].concat(...f035s.map(toMelindaIds));\n  const f035MelindaIds = [...new Set(allF035MelindaIds)];\n\n  debugData(`Fields (${f035s.length}): ${JSON.stringify(f035s)}`);\n  debugData(`Ids (${allF035MelindaIds.length}): ${JSON.stringify(allF035MelindaIds)}`);\n  debugData(`Unique ids (${f035MelindaIds.length}): ${JSON.stringify(f035MelindaIds)}`);\n\n  return f035MelindaIds;\n\n  function toMelindaIds({subfields}) {\n    const melindaIdRegExp = /^(?<prefix>\\(FI-MELINDA\\)|FCC)(?<id>\\d{9})$/u;\n\n    return subfields\n      .filter(sub => ['a', 'z'].includes(sub.code))\n      .filter(sub => melindaIdRegExp.test(sub.value))\n      .map(({value}) => value.replace(melindaIdRegExp, '$<id>'));\n\n  }\n}\n\nexport function validateSidFieldSubfieldCounts(field) {\n  // Valid SID-fields have just one $c and one $b\n  debugData(`Validating SID field ${JSON.stringify(field)}`);\n  const countC = countSubfields(field, 'c');\n  const countB = countSubfields(field, 'b');\n  debug(`Found ${countC} sf $cs and ${countB} sf $bs. IsValid: ${countC === 1 && countB === 1}`);\n\n  return countC === 1 && countB === 1;\n}\n\nfunction countSubfields(field, subfieldCode) {\n  // debug(`Counting subfields ${subfieldCode}`);\n  return field.subfields.filter(({code}) => code === subfieldCode).length;\n}\n\nexport function getSubfieldValues(field, subfieldCode) {\n  debugData(`Get subfield(s) $${subfieldCode} from ${JSON.stringify(field)}`);\n  return field.subfields.filter(({code}) => code === subfieldCode).map(({value}) => value);\n}\n\n"],"file":"matching-utils.js"}
+{"version":3,"file":"matching-utils.js","names":["_debug","_interopRequireDefault","require","obj","__esModule","default","debug","createDebugLogger","debugData","extend","getMelindaIdsF035","record","f035s","getFields","length","allF035MelindaIds","concat","map","toMelindaIds","f035MelindaIds","Set","JSON","stringify","subfields","melindaIdRegExp","filter","sub","includes","code","testStringOrNumber","value","test","String","replace","validateSidFieldSubfieldCounts","field","countC","countSubfields","countB","subfieldCode","getSubfieldValues","extractSubfieldsFromField","subfieldCodes","undefined","resultSubfields","uniqueSubfields","reduce","arr","e","find","item","newArr","getMatchCounts","aValues","bValues","matchingValues","getMatchingValuesAmount","maxValues","possibleMatchValues","aValue","some","bValue","aToB","bToA"],"sources":["../src/matching-utils.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:utils');\nconst debugData = debug.extend('data');\n\nexport function getMelindaIdsF035(record) {\n\n  const debug = createDebugLogger('@natlibfi/melinda-record-matching:melinda-id');\n  const debugData = debug.extend('data');\n\n  const f035s = record.getFields('035');\n\n  if (f035s.length < 1) {\n    debug(`No f035s found.`);\n    return [];\n  }\n\n  const allF035MelindaIds = [].concat(...f035s.map(toMelindaIds));\n  const f035MelindaIds = [...new Set(allF035MelindaIds)];\n\n  debugData(`Fields (${f035s.length}): ${JSON.stringify(f035s)}`);\n  debugData(`Ids (${allF035MelindaIds.length}): ${JSON.stringify(allF035MelindaIds)}`);\n  debugData(`Unique ids (${f035MelindaIds.length}): ${JSON.stringify(f035MelindaIds)}`);\n\n  return f035MelindaIds;\n\n  function toMelindaIds({subfields}) {\n    const melindaIdRegExp = /^(?<prefix>\\(FI-MELINDA\\)|FCC)(?<id>\\d{9})$/u;\n\n    return subfields\n      .filter(sub => ['a', 'z'].includes(sub.code))\n      .filter(sub => testStringOrNumber(sub.value) && melindaIdRegExp.test(String(sub.value)))\n      .map(({value}) => testStringOrNumber(value) ? String(value).replace(melindaIdRegExp, '$<id>') : '');\n\n  }\n}\n\nexport function validateSidFieldSubfieldCounts(field) {\n  // Valid SID-fields have just one $c and one $b\n  debugData(`Validating SID field ${JSON.stringify(field)}`);\n  const countC = countSubfields(field, 'c');\n  const countB = countSubfields(field, 'b');\n  debug(`Found ${countC} sf $cs and ${countB} sf $bs. IsValid: ${countC === 1 && countB === 1}`);\n\n  return countC === 1 && countB === 1;\n}\n\nfunction countSubfields(field, subfieldCode) {\n  // debug(`Counting subfields ${subfieldCode}`);\n  return field.subfields.filter(({code}) => code === subfieldCode).length;\n}\n\nexport function getSubfieldValues(field, subfieldCode) {\n  debugData(`Get subfield(s) $${subfieldCode} from ${JSON.stringify(field)}`);\n  return field.subfields\n    .filter(({code}) => code === subfieldCode)\n    .map(({value}) => testStringOrNumber(value) ? String(value) : '')\n    .filter(value => value);\n}\n\nexport function testStringOrNumber(value) {\n  if (typeof value === 'string' || typeof value === 'number') {\n    return true;\n  }\n  return false;\n}\n\nexport function extractSubfieldsFromField(field, subfieldCodes) {\n  if (field === undefined || field.subfields === undefined) {\n    return [];\n  }\n  const resultSubfields = field.subfields\n    .filter(({code}) => subfieldCodes.includes(code))\n    .map(({code, value}) => ({code, value: testStringOrNumber(value) ? String(value) : ''}))\n    .filter(value => value);\n  return resultSubfields;\n}\n\nexport function uniqueSubfields(subfields) {\n  return subfields.reduce((arr, e) => {\n    if (!arr.find(item => item.code === e.code && item.value === e.value)) {\n      const newArr = arr.concat(e);\n      return newArr;\n    }\n    return arr;\n  }, []);\n}\n\nexport function getMatchCounts(aValues, bValues) {\n\n  const matchingValues = getMatchingValuesAmount(aValues, bValues);\n\n  return {\n    maxValues: aValues.length > bValues.length ? aValues.length : bValues.length,\n    // possibleMatchingValues: amount of identifiers in set of less identifiers (we cannot more values than these)\n    possibleMatchValues: aValues.length > bValues.length ? bValues.length : aValues.length,\n    matchingValues\n  };\n\n  function getMatchingValuesAmount(aValues, bValues) {\n    if (bValues.length > aValues.length) {\n      return aValues.filter(aValue => bValues.some(bValue => aValue === bValue)).length;\n    }\n    if (aValues.length > bValues.length) {\n      return bValues.filter(bValue => aValues.some(aValue => bValue === aValue)).length;\n    }\n\n    // If we have same amount of values, we'll check matches both ways, to avoid mixups in cases\n    // there would be duplicate values\n    const aToB = aValues.filter(aValue => bValues.some(bValue => aValue === bValue)).length;\n    const bToA = bValues.filter(bValue => aValues.some(aValue => bValue === aValue)).length;\n\n    return aToB < bToA ? aToB : bToA;\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -14,15 +14,16 @@
 		"url": "git@github.com:natlibfi/melinda-record-matching-js.git"
 	},
 	"license": "LGPL-3.0+",
-	"version": "2.0.1",
+	"version": "2.0.7-alpha.1",
 	"main": "./dist/index.js",
 	"engines": {
-		"node": ">=14"
+		"node": ">=18"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
 	"scripts": {
+		"prepare": "npm run build",
 		"start": "node dist/index.js",
 		"cli": "node dist/cli.js",
 		"lint": "eslint src",
@@ -35,34 +36,36 @@
 		"watch:test": "cross-env DEBUG=1 NODE_ENV=test nodemon -w src -w test-fixtures --exec 'npm run test:dev'"
 	},
 	"dependencies": {
-		"@natlibfi/marc-record": "^7.0.0",
-		"@natlibfi/marc-record-serializers": "^8.0.4",
-		"@natlibfi/sru-client": "^5.0.0",
-		"debug": "^4.3.3",
-		"moment": "^2.29.1",
-		"natural": "^5.1.11",
-		"uuid": "^8.3.2",
-		"winston": "^3.3.3"
+		"@natlibfi/marc-record": "^7.3.0",
+		"@natlibfi/marc-record-serializers": "^10.1.0",
+		"@natlibfi/melinda-commons": "^13.0.5",
+		"@natlibfi/sru-client": "^6.0.4",
+		"debug": "^4.3.4",
+		"isbn3": "^1.1.40",
+		"moment": "^2.29.4",
+		"natural": "^6.5.0",
+		"uuid": "^9.0.0",
+		"winston": "^3.10.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.16.0",
-		"@babel/core": "^7.16.0",
-		"@babel/node": "^7.16.0",
-		"@babel/preset-env": "^7.16.4",
-		"@babel/register": "^7.16.0",
-		"@babel/eslint-parser": "^7.16.3",
-		"@natlibfi/eslint-config-melinda-backend": "^1.1.1",
-		"@natlibfi/fixugen": "^1.0.2",
-		"@natlibfi/fixugen-http-client": "^1.1.3",
-		"@natlibfi/fixura": "^2.2.1",
+		"@babel/cli": "^7.22.10",
+		"@babel/core": "^7.22.10",
+		"@babel/eslint-parser": "^7.22.10",
+		"@babel/node": "^7.22.10",
+		"@babel/preset-env": "^7.22.10",
+		"@babel/register": "^7.22.5",
+		"@natlibfi/eslint-config-melinda-backend": "^3.0.1",
+		"@natlibfi/fixugen": "^2.0.1",
+		"@natlibfi/fixugen-http-client": "^3.0.0",
+		"@natlibfi/fixura": "^3.0.1",
 		"babel-plugin-istanbul": "^6.1.1",
 		"babel-plugin-rewire": "^1.2.0",
-		"chai": "^4.3.4",
+		"chai": "^4.3.7",
 		"chai-as-promised": "^7.1.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^7.32.0",
-		"mocha": "^9.1.3",
-		"nodemon": "^2.0.15",
+		"eslint": "^8.47.0",
+		"mocha": "^10.2.0",
+		"nodemon": "^3.0.1",
 		"nyc": "^15.1.0"
 	},
 	"eslintConfig": {

package/src/candidate-search/index.js

@@ -4,7 +4,7 @@
 *
 * Melinda record matching modules for Javascript
 *
-* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)
+* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
 *
 * This file is part of melinda-record-matching-js
 *
@@ -31,56 +31,95 @@ import createClient, {SruSearchError} from '@natlibfi/sru-client';
 import {MarcRecord} from '@natlibfi/marc-record';
 import {MARCXML} from '@natlibfi/marc-record-serializers';
 import generateQueryList from './query-list';
+import {Error as MatchingError} from '@natlibfi/melinda-commons';
 
 export {searchTypes} from './query-list';
 
 export class CandidateSearchError extends Error {}
 
-export default ({record, searchSpec, url, maxRecordsPerRequest = 50}) => {
+// serverMaxResults : maximum size of total search result available from the server, defaults to Aleph's 20000
+
+export default ({record, searchSpec, url, maxCandidates, maxRecordsPerRequest = 50, serverMaxResult = 20000}) => {
   MarcRecord.setValidationOptions({subfieldValues: false});
 
   const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search');
+  const debugData = debug.extend('data');
+
+  debugData(`SearchSpec: ${JSON.stringify(searchSpec)}`);
+  debugData(`Url: ${url}`);
+  debugData(`MaxRecordsPerRequest ${maxRecordsPerRequest}`);
+  debugData(`ServerMaxResult: ${serverMaxResult}`);
+  debugData(`MaxCandidates: ${maxCandidates}`);
+
+  // Do not retrieve more candidates than defined in maxCandidates
+  const adjustedMaxRecordsPerRequest = maxRecordsPerRequest >= maxCandidates ? maxCandidates : maxRecordsPerRequest;
+
   const inputRecordId = getRecordId(record);
   const queryList = generateQueryList(record, searchSpec);
   const client = createClient({
-    url, maxRecordsPerRequest,
+    url,
+    maxRecordsPerRequest: adjustedMaxRecordsPerRequest,
     version: '2.0',
     retrieveAll: false
   });
 
   debug(`Searching matches for ${inputRecordId}`);
   debug(`Generated queryList ${JSON.stringify(queryList)}`);
-  if (queryList.length === 0) { // eslint-disable-line functional/no-conditional-statement
+
+  // if generateQueryList errored we should throw 422
+
+  if (queryList.length === 0) {
     throw new CandidateSearchError(`Generated query list contains no queries`);
   }
 
-  // eslint-disable-next-line max-statements
-  return async ({queryOffset = 0, resultSetOffset = 1}) => {
+  // state.totalRecords : amount of candidate records available to the current query (undefined, if there was no queries left)
+  // state.query : current query (undefined if there was no queries left)
+  // state.searchCounter : sequence for current search for current query (undefined, if there we no queries left)
+  // state.queryCandidateCounter: amount of candidates (records+failures) retrieved from SRU for matching for current query, including the current record+failure set (undefined if there were no queries left)
+  // state.queriesLeft : amount of queries left
+  // state.queryCounter : sequence for current query
+  // state.maxedQueries : queries that resulted in more than serverMaxResults hits
+
+
+  return async ({queryOffset = 0, resultSetOffset = 1, totalRecords = 0, searchCounter = 0, queryCandidateCounter = 0, queryCounter = 0, maxedQueries = []}) => {
     const query = queryList[queryOffset];
 
     if (query) {
-      const {records, nextOffset} = await retrieveRecords();
+      const {records, failures, nextOffset, total} = await retrieveRecords();
+
+      // If resultSetOffset === 1 this is the first search for the current query
+      debugData(`ResultSetOffset: ${resultSetOffset}`);
+      const newTotalRecords = resultSetOffset === 1 ? total : totalRecords;
+      const newQueryCounter = resultSetOffset === 1 ? queryCounter + 1 : queryCounter;
+      const newSearchCounter = resultSetOffset === 1 ? 1 : searchCounter + 1;
+      const newQueryCandidateCounter = resultSetOffset === 1 ? records.length + failures.length : queryCandidateCounter + records.length + failures.length;
+
+      const maxedQuery = resultSetOffset === 1 ? checkMaxedQuery(query, total, serverMaxResult) : undefined;
+      const newMaxedQueries = maxedQuery ? maxedQueries.concat(maxedQuery) : maxedQueries;
 
       if (typeof nextOffset === 'number') {
-        debug(`Running next search for query ${queryOffset} ${query}`);
-        return {records, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1)};
+        debug(`Next search will be for query ${queryOffset} ${query}, starting from record ${nextOffset}`);
+        return {records, failures, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};
       }
-      debug(`Query ${queryOffset} ${query} done, moving to next query. (${queryList.length - (queryOffset + 1)} queries left)`);
-      return {records, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1)};
+      debug(`Query ${queryOffset} ${query} done.`);
+      debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);
+      return {records, failures, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};
     }
 
     debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);
-    return {records: []};
+    return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};
 
     function retrieveRecords() {
       return new Promise((resolve, reject) => {
         const promises = [];
+        // eslint-disable-next-line functional/no-let
+        let totalRecords = 0;
 
         debug(`Searching for candidates with query: ${query} (Offset ${resultSetOffset})`);
 
         client.searchRetrieve(query, {startRecord: resultSetOffset})
           .on('error', err => {
-            // eslint-disable-next-line functional/no-conditional-statement
+            // eslint-disable-next-line functional/no-conditional-statements
             if (err instanceof SruSearchError) {
               debug(`SRU SruSearchError for query: ${query}: ${err}`);
               reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));
@@ -88,37 +127,45 @@ export default ({record, searchSpec, url, maxRecordsPerRequest = 50}) => {
             debug(`SRU error for query: ${query}: ${err}`);
             reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));
           })
+          .on('total', total => {
+            debug(`Got total: ${total}`);
+            totalRecords += total;
+          })
           .on('end', async nextOffset => {
             try {
-              const records = await Promise.all(promises);
-              const filtered = records.filter(r => r);
+              const recordPromises = await Promise.allSettled(promises);
+              debugData(`All recordPromises: ${JSON.stringify(recordPromises)}`);
+              const filtered = recordPromises.filter(r => r.status === 'fulfilled').map(r => r.value);
+              const failures = recordPromises.filter(r => r.status === 'rejected').map(r => ({status: r.reason.status, payload: r.reason.payload}));
+
+              debug(`Found ${recordPromises.length} records`);
+              debug(`Found ${filtered.length} convertable candidates`);
+              debug(`Found ${failures.length} NON-convertable candidates`);
+              debugData(`Converted: ${JSON.stringify(filtered)}.`);
+              debugData(`Not converted: ${JSON.stringify(failures)}.`);
 
-              debug(`Found ${filtered.length} candidates`);
 
-              resolve({nextOffset, records: filtered});
+              resolve({nextOffset, records: filtered, failures, total: totalRecords});
             } catch (err) {
+              debug(`Error caught on END`);
               reject(err);
             }
           })
-          .on('record', foundRecord => {
+          .on('record', recordXML => {
             promises.push(handleRecord()); // eslint-disable-line functional/immutable-data
 
             async function handleRecord() {
               try {
-                const foundRecordMarc = await MARCXML.from(foundRecord, {subfieldValues: false});
-                const foundRecordId = getRecordId(foundRecordMarc);
-
-                // This does not work and might cause problems:
-                // Record *should* match itself AND in REST the input record is given id 000000001 always
-                debug(`Checking ${inputRecordId} vs ${foundRecordId}`);
-                if (inputRecordId === foundRecordId) {
-                  debug(`Input and candidate are the same record per 001. Discarding candidate`);
-                  return;
-                }
-
-                return {record: foundRecordMarc, id: foundRecordId};
+                const recordMarc = await MARCXML.from(recordXML, {subfieldValues: false});
+                const recordId = getRecordId(recordMarc);
+
+                return {record: recordMarc, id: recordId};
               } catch (err) {
-                throw new Error(`Failed converting record: ${err}, record: ${foundRecord}`);
+                // What should this do?
+                const idFromXML = getRecordIdFromXML(recordXML);
+                debugData(`Failed converting record: ${err.message}, id: ${idFromXML}, data: ${recordXML}`);
+                //return {message: `Failed converting record: ${err.message}`, id: idFromXML, data: recordXML};
+                throw new MatchingError(422, {message: `Failed converting record: ${err.message}`, id: idFromXML || '000000000', data: recordXML});
               }
             }
           });
@@ -126,8 +173,23 @@ export default ({record, searchSpec, url, maxRecordsPerRequest = 50}) => {
     }
   };
 
+  function checkMaxedQuery(query, total, serverMaxResult) {
+    if (total >= serverMaxResult) {
+      debug(`WARNING: Query ${query} resulted in ${total} hits which meets the serverMaxResult (${serverMaxResult}) `);
+      return query;
+    }
+  }
+
+
   function getRecordId(record) {
     const [field] = record.get(/^001$/u);
     return field ? field.value : '';
   }
+
+  function getRecordIdFromXML(recordXML) {
+    //<controlfield tag=\"001\">015376846</controlfield
+    debug(`Cannot yet find possible database record id from recordXML (length ${recordXML.length})`);
+    return undefined;
+  }
+
 };

package/src/candidate-search/index.spec.js

@@ -4,7 +4,7 @@
 *
 * Melinda record matching modules for Javascript
 *
-* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)
+* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
 *
 * This file is part of melinda-record-matching-js
 *
@@ -30,7 +30,11 @@ import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen-http-client';
 import {MarcRecord} from '@natlibfi/marc-record';
+import {Error as MatchingError} from '@natlibfi/melinda-commons';
 import createSearchInterface, {CandidateSearchError} from '.';
+import createDebugLogger from 'debug';
+
+const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:test');
 
 describe('candidate-search', () => {
   generateTests({
@@ -42,8 +46,7 @@ describe('candidate-search', () => {
     }
   });
 
-  // eslint-disable-next-line max-statements
-  async function callback({getFixture, factoryOptions, searchOptions, expectedFactoryError, expectedSearchError, enabled = true}) {
+  async function callback({getFixture, factoryOptions, searchOptions, expectedFactoryError = false, expectedSearchError = false, enabled = true}) {
     const url = 'http://foo.bar';
 
     if (!enabled) {
@@ -61,55 +64,55 @@ describe('candidate-search', () => {
     }
 
     const search = createSearchInterface({...formatFactoryOptions(), url});
-    await iterate({searchOptions});
+    await iterate({searchOptions, expectedSearchError});
 
     function formatFactoryOptions() {
+      debug(`Using factoryOptions: ${JSON.stringify(factoryOptions)}`);
       return {
         ...factoryOptions,
-        maxRecordsPerRequest: 1,
+        maxRecordsPerRequest: factoryOptions.maxRecordsPerRequest || 1,
+        maxServerResults: factoryOptions.maxServerResults || undefined,
         record: new MarcRecord(factoryOptions.record, {subfieldValues: false})
       };
     }
 
-    // eslint-disable-next-line max-statements
-    async function iterate({searchOptions, count = 1}) {
+    async function iterate({searchOptions, expectedSearchError, expectedErrorStatus, count = 1}) {
       const expectedResults = getFixture(`expectedResults${count}.json`);
 
-      if (expectedSearchError) { // eslint-disable-line functional/no-conditional-statement
+      if (expectedSearchError) { // eslint-disable-line functional/no-conditional-statements
         try {
           await search(searchOptions);
           throw new Error('Expected an error');
         } catch (err) {
+          debug(`Got an error: ${err}`);
           expect(err).to.be.an('error');
-          expect(err.message).to.match(new RegExp(expectedSearchError, 'u'));
+          const errorMessage = err instanceof MatchingError ? err.payload.message : err.message;
+          const errorStatus = err instanceof MatchingError ? err.status : undefined;
+          debug(`errorMessage: ${errorMessage}, errorStatus: ${errorStatus}`);
+          expect(errorMessage).to.match(new RegExp(expectedSearchError, 'u'));
+
+          if (expectedErrorStatus) {
+            expect(errorStatus).to.be(expectedErrorStatus);
+            return;
+          }
           return;
         }
       }
 
-      const results = await search(searchOptions);
-
-      expect(formatResults(results)).to.eql(expectedResults);
-
-      if (results.records.length > 0) {
-        return iterate({
-          searchOptions: resultsToOptions(results),
-          count: count + 1
-        });
+      // eslint-disable-next-line functional/no-conditional-statements
+      if (!expectedSearchError) {
+        const results = await search(searchOptions);
+        expect(formatResults(results)).to.eql(expectedResults);
       }
 
       function formatResults(results) {
-        // console.log(results); //eslint-disable-line
+        debug(results);
         return {
           ...results,
           records: results.records.map(({record, id}) => ({id, record: record.toObject()}))
         };
       }
 
-      function resultsToOptions(results) {
-        return Object.entries(results)
-          .filter(([k]) => k === 'records' === false) // If key is 'records' return false
-          .reduce((acc, [k, v]) => ({...acc, [k]: v}), {});
-      }
     }
   }
 });