@natlibfi/melinda-record-matching 2.0.0 → 2.0.1-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "searchTypes", {
|
|
|
13
13
|
|
|
14
14
|
var _debug = _interopRequireDefault(require("debug"));
|
|
15
15
|
|
|
16
|
-
var _sruClient =
|
|
16
|
+
var _sruClient = _interopRequireWildcard(require("@natlibfi/sru-client"));
|
|
17
17
|
|
|
18
18
|
var _marcRecord = require("@natlibfi/marc-record");
|
|
19
19
|
|
|
@@ -128,6 +128,13 @@ var _default = ({
|
|
|
128
128
|
client.searchRetrieve(query, {
|
|
129
129
|
startRecord: resultSetOffset
|
|
130
130
|
}).on('error', err => {
|
|
131
|
+
// eslint-disable-next-line functional/no-conditional-statement
|
|
132
|
+
if (err instanceof _sruClient.SruSearchError) {
|
|
133
|
+
debug(`SRU SruSearchError for query: ${query}: ${err}`);
|
|
134
|
+
reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
debug(`SRU error for query: ${query}: ${err}`);
|
|
131
138
|
reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));
|
|
132
139
|
}).on('end', async nextOffset => {
|
|
133
140
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/candidate-search/index.js"],"names":["CandidateSearchError","Error","record","searchSpec","url","maxRecordsPerRequest","MarcRecord","setValidationOptions","subfieldValues","debug","inputRecordId","getRecordId","queryList","client","version","retrieveAll","JSON","stringify","length","queryOffset","resultSetOffset","query","records","nextOffset","retrieveRecords","queriesLeft","Promise","resolve","reject","promises","searchRetrieve","startRecord","on","err","all","filtered","filter","r","foundRecord","push","handleRecord","foundRecordMarc","MARCXML","from","foundRecordId","id","field","get","value"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/candidate-search/index.js"],"names":["CandidateSearchError","Error","record","searchSpec","url","maxRecordsPerRequest","MarcRecord","setValidationOptions","subfieldValues","debug","inputRecordId","getRecordId","queryList","client","version","retrieveAll","JSON","stringify","length","queryOffset","resultSetOffset","query","records","nextOffset","retrieveRecords","queriesLeft","Promise","resolve","reject","promises","searchRetrieve","startRecord","on","err","SruSearchError","all","filtered","filter","r","foundRecord","push","handleRecord","foundRecordMarc","MARCXML","from","foundRecordId","id","field","get","value"],"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';\nimport createClient, {SruSearchError} from '@natlibfi/sru-client';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {MARCXML} from '@natlibfi/marc-record-serializers';\nimport generateQueryList from './query-list';\n\nexport {searchTypes} from './query-list';\n\nexport class CandidateSearchError extends Error {}\n\nexport default ({record, searchSpec, url, maxRecordsPerRequest = 50}) => {\n MarcRecord.setValidationOptions({subfieldValues: false});\n\n const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search');\n const inputRecordId = getRecordId(record);\n const queryList = generateQueryList(record, searchSpec);\n const client = createClient({\n url, maxRecordsPerRequest,\n version: '2.0',\n retrieveAll: false\n });\n\n debug(`Searching matches for ${inputRecordId}`);\n debug(`Generated queryList ${JSON.stringify(queryList)}`);\n if (queryList.length === 0) { // eslint-disable-line functional/no-conditional-statement\n throw new CandidateSearchError(`Generated query list contains no queries`);\n }\n\n // eslint-disable-next-line max-statements\n return async ({queryOffset = 0, resultSetOffset = 1}) => {\n const query = queryList[queryOffset];\n\n if (query) {\n const {records, nextOffset} = await retrieveRecords();\n\n if (typeof nextOffset === 'number') {\n debug(`Running next search for query ${queryOffset} ${query}`);\n return {records, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1)};\n }\n debug(`Query ${queryOffset} ${query} done, moving to next query. (${queryList.length - (queryOffset + 1)} queries left)`);\n return {records, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1)};\n }\n\n debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);\n return {records: []};\n\n function retrieveRecords() {\n return new Promise((resolve, reject) => {\n const promises = [];\n\n debug(`Searching for candidates with query: ${query} (Offset ${resultSetOffset})`);\n\n client.searchRetrieve(query, {startRecord: resultSetOffset})\n .on('error', err => {\n // eslint-disable-next-line functional/no-conditional-statement\n if (err instanceof SruSearchError) {\n debug(`SRU SruSearchError for query: ${query}: ${err}`);\n reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));\n }\n debug(`SRU error for query: ${query}: ${err}`);\n reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));\n })\n .on('end', async nextOffset => {\n try {\n const records = await Promise.all(promises);\n const filtered = records.filter(r => r);\n\n debug(`Found ${filtered.length} candidates`);\n\n resolve({nextOffset, records: filtered});\n } catch (err) {\n reject(err);\n }\n })\n .on('record', foundRecord => {\n promises.push(handleRecord()); // eslint-disable-line functional/immutable-data\n\n async function handleRecord() {\n try {\n const foundRecordMarc = await MARCXML.from(foundRecord, {subfieldValues: false});\n const foundRecordId = getRecordId(foundRecordMarc);\n\n // This does not work and might cause problems:\n // Record *should* match itself AND in REST the input record is given id 000000001 always\n debug(`Checking ${inputRecordId} vs ${foundRecordId}`);\n if (inputRecordId === foundRecordId) {\n debug(`Input and candidate are the same record per 001. Discarding candidate`);\n return;\n }\n\n return {record: foundRecordMarc, id: foundRecordId};\n } catch (err) {\n throw new Error(`Failed converting record: ${err}, record: ${foundRecord}`);\n }\n }\n });\n });\n }\n };\n\n function getRecordId(record) {\n const [field] = record.get(/^001$/u);\n return field ? field.value : '';\n }\n};\n"],"file":"index.js"}
|
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"url": "git@github.com:natlibfi/melinda-record-matching-js.git"
|
|
15
15
|
},
|
|
16
16
|
"license": "LGPL-3.0+",
|
|
17
|
-
"version": "2.0.
|
|
17
|
+
"version": "2.0.1-alpha.1",
|
|
18
18
|
"main": "./dist/index.js",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14"
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"watch:test": "cross-env DEBUG=1 NODE_ENV=test nodemon -w src -w test-fixtures --exec 'npm run test:dev'"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@natlibfi/marc-record": "^7.0.0
|
|
38
|
+
"@natlibfi/marc-record": "^7.0.0",
|
|
39
39
|
"@natlibfi/marc-record-serializers": "^8.0.4",
|
|
40
|
-
"@natlibfi/sru-client": "^
|
|
41
|
-
"debug": "^4.3.
|
|
40
|
+
"@natlibfi/sru-client": "^5.0.0-alpha.1",
|
|
41
|
+
"debug": "^4.3.3",
|
|
42
42
|
"moment": "^2.29.1",
|
|
43
43
|
"natural": "^5.1.11",
|
|
44
44
|
"uuid": "^8.3.2",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
*/
|
|
28
28
|
|
|
29
29
|
import createDebugLogger from 'debug';
|
|
30
|
-
import createClient from '@natlibfi/sru-client';
|
|
30
|
+
import createClient, {SruSearchError} from '@natlibfi/sru-client';
|
|
31
31
|
import {MarcRecord} from '@natlibfi/marc-record';
|
|
32
32
|
import {MARCXML} from '@natlibfi/marc-record-serializers';
|
|
33
33
|
import generateQueryList from './query-list';
|
|
@@ -80,6 +80,12 @@ export default ({record, searchSpec, url, maxRecordsPerRequest = 50}) => {
|
|
|
80
80
|
|
|
81
81
|
client.searchRetrieve(query, {startRecord: resultSetOffset})
|
|
82
82
|
.on('error', err => {
|
|
83
|
+
// eslint-disable-next-line functional/no-conditional-statement
|
|
84
|
+
if (err instanceof SruSearchError) {
|
|
85
|
+
debug(`SRU SruSearchError for query: ${query}: ${err}`);
|
|
86
|
+
reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));
|
|
87
|
+
}
|
|
88
|
+
debug(`SRU error for query: ${query}: ${err}`);
|
|
83
89
|
reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));
|
|
84
90
|
})
|
|
85
91
|
.on('end', async nextOffset => {
|