@natlibfi/melinda-record-matching 2.0.1 → 2.1.0-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.
- package/README.md +1 -1
- package/dist/candidate-search/index.js +73 -15
- package/dist/candidate-search/index.js.map +1 -1
- package/dist/candidate-search/index.spec.js +7 -2
- package/dist/candidate-search/index.spec.js.map +1 -1
- package/dist/index.js +357 -39
- package/dist/index.js.map +1 -1
- package/dist/index.spec.js +46 -20
- package/dist/index.spec.js.map +1 -1
- package/dist/match-detection/index.js +29 -5
- package/dist/match-detection/index.js.map +1 -1
- package/package.json +12 -12
- package/src/candidate-search/index.js +55 -11
- package/src/candidate-search/index.spec.js +7 -2
- package/src/index.js +239 -37
- package/src/index.spec.js +44 -17
- package/src/match-detection/index.js +23 -3
package/README.md
CHANGED
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
## License and copyright
|
|
4
4
|
|
|
5
|
-
Copyright (c) 2020 **University Of Helsinki (The National Library Of Finland)**
|
|
5
|
+
Copyright (c) 2020-2022 **University Of Helsinki (The National Library Of Finland)**
|
|
6
6
|
|
|
7
7
|
This project's source code is licensed under the terms of **GNU Lesser General Public License Version 3** or any later version.
|
|
@@ -33,7 +33,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
33
33
|
*
|
|
34
34
|
* Melinda record matching modules for Javascript
|
|
35
35
|
*
|
|
36
|
-
* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)
|
|
36
|
+
* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
|
|
37
37
|
*
|
|
38
38
|
* This file is part of melinda-record-matching-js
|
|
39
39
|
*
|
|
@@ -54,7 +54,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
54
54
|
* for the JavaScript code in this file.
|
|
55
55
|
*
|
|
56
56
|
*/
|
|
57
|
-
class CandidateSearchError extends Error {}
|
|
57
|
+
class CandidateSearchError extends Error {} // serverMaxResults : maximum size of total search result available from the server, defaults to Aleph's 20000
|
|
58
|
+
// eslint-disable-next-line max-statements
|
|
59
|
+
|
|
58
60
|
|
|
59
61
|
exports.CandidateSearchError = CandidateSearchError;
|
|
60
62
|
|
|
@@ -62,13 +64,19 @@ var _default = ({
|
|
|
62
64
|
record,
|
|
63
65
|
searchSpec,
|
|
64
66
|
url,
|
|
65
|
-
maxRecordsPerRequest = 50
|
|
67
|
+
maxRecordsPerRequest = 50,
|
|
68
|
+
serverMaxResult = 20000
|
|
66
69
|
}) => {
|
|
67
70
|
_marcRecord.MarcRecord.setValidationOptions({
|
|
68
71
|
subfieldValues: false
|
|
69
72
|
});
|
|
70
73
|
|
|
71
74
|
const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search');
|
|
75
|
+
const debugData = debug.extend('data');
|
|
76
|
+
debugData(`SearchSpec: ${JSON.stringify(searchSpec)}`);
|
|
77
|
+
debugData(`Url: ${url}`);
|
|
78
|
+
debugData(`MaxRecordsPerRequest ${maxRecordsPerRequest}`);
|
|
79
|
+
debugData(`ServerMaxResult: ${serverMaxResult}`);
|
|
72
80
|
const inputRecordId = getRecordId(record);
|
|
73
81
|
const queryList = (0, _queryList.default)(record, searchSpec);
|
|
74
82
|
const client = (0, _sruClient.default)({
|
|
@@ -83,47 +91,85 @@ var _default = ({
|
|
|
83
91
|
if (queryList.length === 0) {
|
|
84
92
|
// eslint-disable-line functional/no-conditional-statement
|
|
85
93
|
throw new CandidateSearchError(`Generated query list contains no queries`);
|
|
86
|
-
} //
|
|
94
|
+
} // state.totalRecords : amount of candidate records available to the current query (undefined, if there was no queries left)
|
|
95
|
+
// state.query : current query (undefined if there was no queries left)
|
|
96
|
+
// state.searchCounter : sequence for current search for current query (undefined, if there we no queries left)
|
|
97
|
+
// state.queryCandidateCounter: amount of candidate records retrieved from SRU for matching for current query, including the current record set (undefined if there were no queries left)
|
|
98
|
+
// state.queriesLeft : amount of queries left
|
|
99
|
+
// state.queryCounter : sequence for current query
|
|
100
|
+
// state.maxedQueries : queries that resulted in more than serverMaxResults hits
|
|
101
|
+
// eslint-disable-next-line max-statements
|
|
87
102
|
|
|
88
103
|
|
|
89
104
|
return async ({
|
|
90
105
|
queryOffset = 0,
|
|
91
|
-
resultSetOffset = 1
|
|
106
|
+
resultSetOffset = 1,
|
|
107
|
+
totalRecords = 0,
|
|
108
|
+
searchCounter = 0,
|
|
109
|
+
queryCandidateCounter = 0,
|
|
110
|
+
queryCounter = 0,
|
|
111
|
+
maxedQueries = []
|
|
92
112
|
}) => {
|
|
93
113
|
const query = queryList[queryOffset];
|
|
94
114
|
|
|
95
115
|
if (query) {
|
|
96
116
|
const {
|
|
97
117
|
records,
|
|
98
|
-
nextOffset
|
|
99
|
-
|
|
118
|
+
nextOffset,
|
|
119
|
+
total
|
|
120
|
+
} = await retrieveRecords(); // If resultSetOffset === 1 this is the first search for the current query
|
|
121
|
+
|
|
122
|
+
const newTotalRecords = resultSetOffset === 1 ? total : totalRecords;
|
|
123
|
+
const newQueryCounter = resultSetOffset === 1 ? queryCounter + 1 : queryCounter;
|
|
124
|
+
const newSearchCounter = resultSetOffset === 1 ? 1 : searchCounter + 1;
|
|
125
|
+
const newQueryCandidateCounter = resultSetOffset === 1 ? records.length : queryCandidateCounter + records.length;
|
|
126
|
+
const maxedQuery = resultSetOffset === 1 ? checkMaxedQuery(query, total, serverMaxResult) : undefined;
|
|
127
|
+
const newMaxedQueries = maxedQuery ? maxedQueries.concat(maxedQuery) : maxedQueries;
|
|
100
128
|
|
|
101
129
|
if (typeof nextOffset === 'number') {
|
|
102
|
-
debug(`
|
|
130
|
+
debug(`Next search will be for query ${queryOffset} ${query}, starting from record ${nextOffset}`);
|
|
103
131
|
return {
|
|
104
132
|
records,
|
|
105
133
|
queryOffset,
|
|
106
134
|
resultSetOffset: nextOffset,
|
|
107
|
-
queriesLeft: queryList.length - (queryOffset + 1)
|
|
135
|
+
queriesLeft: queryList.length - (queryOffset + 1),
|
|
136
|
+
totalRecords: newTotalRecords,
|
|
137
|
+
query,
|
|
138
|
+
searchCounter: newSearchCounter,
|
|
139
|
+
queryCandidateCounter: newQueryCandidateCounter,
|
|
140
|
+
queryCounter: newQueryCandidateCounter,
|
|
141
|
+
maxedQueries: newMaxedQueries
|
|
108
142
|
};
|
|
109
143
|
}
|
|
110
144
|
|
|
111
|
-
debug(`Query ${queryOffset} ${query} done
|
|
145
|
+
debug(`Query ${queryOffset} ${query} done.`);
|
|
146
|
+
debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);
|
|
112
147
|
return {
|
|
113
148
|
records,
|
|
114
149
|
queryOffset: queryOffset + 1,
|
|
115
|
-
queriesLeft: queryList.length - (queryOffset + 1)
|
|
150
|
+
queriesLeft: queryList.length - (queryOffset + 1),
|
|
151
|
+
totalRecords: newTotalRecords,
|
|
152
|
+
query,
|
|
153
|
+
searchCounter: newSearchCounter,
|
|
154
|
+
queryCandidateCounter: newQueryCandidateCounter,
|
|
155
|
+
queryCounter: newQueryCounter,
|
|
156
|
+
maxedQueries: newMaxedQueries
|
|
116
157
|
};
|
|
117
158
|
}
|
|
118
159
|
|
|
119
160
|
debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);
|
|
120
161
|
return {
|
|
121
|
-
records: []
|
|
162
|
+
records: [],
|
|
163
|
+
queriesLeft: 0,
|
|
164
|
+
queryCounter,
|
|
165
|
+
maxedQueries
|
|
122
166
|
};
|
|
123
167
|
|
|
124
168
|
function retrieveRecords() {
|
|
125
169
|
return new Promise((resolve, reject) => {
|
|
126
|
-
const promises = [];
|
|
170
|
+
const promises = []; // eslint-disable-next-line functional/no-let
|
|
171
|
+
|
|
172
|
+
let totalRecords = 0;
|
|
127
173
|
debug(`Searching for candidates with query: ${query} (Offset ${resultSetOffset})`);
|
|
128
174
|
client.searchRetrieve(query, {
|
|
129
175
|
startRecord: resultSetOffset
|
|
@@ -136,6 +182,9 @@ var _default = ({
|
|
|
136
182
|
|
|
137
183
|
debug(`SRU error for query: ${query}: ${err}`);
|
|
138
184
|
reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));
|
|
185
|
+
}).on('total', total => {
|
|
186
|
+
debug(`Got total: ${total}`);
|
|
187
|
+
totalRecords += total;
|
|
139
188
|
}).on('end', async nextOffset => {
|
|
140
189
|
try {
|
|
141
190
|
const records = await Promise.all(promises);
|
|
@@ -143,7 +192,8 @@ var _default = ({
|
|
|
143
192
|
debug(`Found ${filtered.length} candidates`);
|
|
144
193
|
resolve({
|
|
145
194
|
nextOffset,
|
|
146
|
-
records: filtered
|
|
195
|
+
records: filtered,
|
|
196
|
+
total: totalRecords
|
|
147
197
|
});
|
|
148
198
|
} catch (err) {
|
|
149
199
|
reject(err);
|
|
@@ -159,7 +209,7 @@ var _default = ({
|
|
|
159
209
|
const foundRecordId = getRecordId(foundRecordMarc); // This does not work and might cause problems:
|
|
160
210
|
// Record *should* match itself AND in REST the input record is given id 000000001 always
|
|
161
211
|
|
|
162
|
-
debug(`Checking ${inputRecordId} vs ${foundRecordId}`);
|
|
212
|
+
debug(`Checking record id's - this does not work ${inputRecordId} vs ${foundRecordId}`);
|
|
163
213
|
|
|
164
214
|
if (inputRecordId === foundRecordId) {
|
|
165
215
|
debug(`Input and candidate are the same record per 001. Discarding candidate`);
|
|
@@ -179,6 +229,14 @@ var _default = ({
|
|
|
179
229
|
}
|
|
180
230
|
};
|
|
181
231
|
|
|
232
|
+
function checkMaxedQuery(query, total, serverMaxResult) {
|
|
233
|
+
// eslint-disable-next-line functional/no-conditional-statement
|
|
234
|
+
if (total >= serverMaxResult) {
|
|
235
|
+
debug(`WARNING: Query ${query} resulted in ${total} hits which meets the serverMaxResult (${serverMaxResult}) `);
|
|
236
|
+
return query;
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
182
240
|
function getRecordId(record) {
|
|
183
241
|
const [field] = record.get(/^001$/u);
|
|
184
242
|
return field ? field.value : '';
|
|
@@ -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","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"}
|
|
1
|
+
{"version":3,"sources":["../../src/candidate-search/index.js"],"names":["CandidateSearchError","Error","record","searchSpec","url","maxRecordsPerRequest","serverMaxResult","MarcRecord","setValidationOptions","subfieldValues","debug","debugData","extend","JSON","stringify","inputRecordId","getRecordId","queryList","client","version","retrieveAll","length","queryOffset","resultSetOffset","totalRecords","searchCounter","queryCandidateCounter","queryCounter","maxedQueries","query","records","nextOffset","total","retrieveRecords","newTotalRecords","newQueryCounter","newSearchCounter","newQueryCandidateCounter","maxedQuery","checkMaxedQuery","undefined","newMaxedQueries","concat","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-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';\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\n// serverMaxResults : maximum size of total search result available from the server, defaults to Aleph's 20000\n\n// eslint-disable-next-line max-statements\nexport default ({record, searchSpec, url, maxRecordsPerRequest = 50, serverMaxResult = 20000}) => {\n MarcRecord.setValidationOptions({subfieldValues: false});\n\n const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search');\n const debugData = debug.extend('data');\n\n debugData(`SearchSpec: ${JSON.stringify(searchSpec)}`);\n debugData(`Url: ${url}`);\n debugData(`MaxRecordsPerRequest ${maxRecordsPerRequest}`);\n debugData(`ServerMaxResult: ${serverMaxResult}`);\n\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 // state.totalRecords : amount of candidate records available to the current query (undefined, if there was no queries left)\n // state.query : current query (undefined if there was no queries left)\n // state.searchCounter : sequence for current search for current query (undefined, if there we no queries left)\n // state.queryCandidateCounter: amount of candidate records retrieved from SRU for matching for current query, including the current record set (undefined if there were no queries left)\n // state.queriesLeft : amount of queries left\n // state.queryCounter : sequence for current query\n // state.maxedQueries : queries that resulted in more than serverMaxResults hits\n\n\n // eslint-disable-next-line max-statements\n return async ({queryOffset = 0, resultSetOffset = 1, totalRecords = 0, searchCounter = 0, queryCandidateCounter = 0, queryCounter = 0, maxedQueries = []}) => {\n const query = queryList[queryOffset];\n\n if (query) {\n const {records, nextOffset, total} = await retrieveRecords();\n\n // If resultSetOffset === 1 this is the first search for the current query\n const newTotalRecords = resultSetOffset === 1 ? total : totalRecords;\n const newQueryCounter = resultSetOffset === 1 ? queryCounter + 1 : queryCounter;\n const newSearchCounter = resultSetOffset === 1 ? 1 : searchCounter + 1;\n const newQueryCandidateCounter = resultSetOffset === 1 ? records.length : queryCandidateCounter + records.length;\n\n const maxedQuery = resultSetOffset === 1 ? checkMaxedQuery(query, total, serverMaxResult) : undefined;\n const newMaxedQueries = maxedQuery ? maxedQueries.concat(maxedQuery) : maxedQueries;\n\n if (typeof nextOffset === 'number') {\n debug(`Next search will be for query ${queryOffset} ${query}, starting from record ${nextOffset}`);\n return {records, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCandidateCounter, maxedQueries: newMaxedQueries};\n }\n debug(`Query ${queryOffset} ${query} done.`);\n debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);\n return {records, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n }\n\n debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);\n return {records: [], queriesLeft: 0, queryCounter, maxedQueries};\n\n function retrieveRecords() {\n return new Promise((resolve, reject) => {\n const promises = [];\n // eslint-disable-next-line functional/no-let\n let totalRecords = 0;\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('total', total => {\n debug(`Got total: ${total}`);\n totalRecords += total;\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, total: totalRecords});\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 record id's - this does not work ${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 checkMaxedQuery(query, total, serverMaxResult) {\n // eslint-disable-next-line functional/no-conditional-statement\n if (total >= serverMaxResult) {\n debug(`WARNING: Query ${query} resulted in ${total} hits which meets the serverMaxResult (${serverMaxResult}) `);\n return query;\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"}
|
|
@@ -10,6 +10,8 @@ var _marcRecord = require("@natlibfi/marc-record");
|
|
|
10
10
|
|
|
11
11
|
var _ = _interopRequireWildcard(require("."));
|
|
12
12
|
|
|
13
|
+
var _debug = _interopRequireDefault(require("debug"));
|
|
14
|
+
|
|
13
15
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
14
16
|
|
|
15
17
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
@@ -22,7 +24,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
22
24
|
*
|
|
23
25
|
* Melinda record matching modules for Javascript
|
|
24
26
|
*
|
|
25
|
-
* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)
|
|
27
|
+
* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
|
|
26
28
|
*
|
|
27
29
|
* This file is part of melinda-record-matching-js
|
|
28
30
|
*
|
|
@@ -43,6 +45,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
43
45
|
* for the JavaScript code in this file.
|
|
44
46
|
*
|
|
45
47
|
*/
|
|
48
|
+
const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:test');
|
|
46
49
|
describe('candidate-search', () => {
|
|
47
50
|
(0, _fixugenHttpClient.default)({
|
|
48
51
|
callback,
|
|
@@ -89,8 +92,10 @@ describe('candidate-search', () => {
|
|
|
89
92
|
});
|
|
90
93
|
|
|
91
94
|
function formatFactoryOptions() {
|
|
95
|
+
debug(`Using factoryOptions: ${JSON.stringify(factoryOptions)}`);
|
|
92
96
|
return { ...factoryOptions,
|
|
93
|
-
maxRecordsPerRequest: 1,
|
|
97
|
+
maxRecordsPerRequest: factoryOptions.maxRecordsPerRequest || 1,
|
|
98
|
+
maxServerResults: factoryOptions.maxServerResults || undefined,
|
|
94
99
|
record: new _marcRecord.MarcRecord(factoryOptions.record, {
|
|
95
100
|
subfieldValues: false
|
|
96
101
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/candidate-search/index.spec.js"],"names":["describe","callback","path","__dirname","recurse","fixura","reader","READERS","JSON","getFixture","factoryOptions","searchOptions","expectedFactoryError","expectedSearchError","enabled","url","isCandidateSearchError","formatFactoryOptions","to","throw","CandidateSearchError","RegExp","search","iterate","maxRecordsPerRequest","record","MarcRecord","subfieldValues","count","expectedResults","Error","err","be","an","message","match","results","formatResults","eql","records","length","resultsToOptions","map","id","toObject","Object","entries","filter","k","reduce","acc","v"],"mappings":";;AA4BA;;AACA;;AACA;;AACA;;AACA;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/candidate-search/index.spec.js"],"names":["debug","describe","callback","path","__dirname","recurse","fixura","reader","READERS","JSON","getFixture","factoryOptions","searchOptions","expectedFactoryError","expectedSearchError","enabled","url","isCandidateSearchError","formatFactoryOptions","to","throw","CandidateSearchError","RegExp","search","iterate","stringify","maxRecordsPerRequest","maxServerResults","undefined","record","MarcRecord","subfieldValues","count","expectedResults","Error","err","be","an","message","match","results","formatResults","eql","records","length","resultsToOptions","map","id","toObject","Object","entries","filter","k","reduce","acc","v"],"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-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 {expect} from 'chai';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen-http-client';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createSearchInterface, {CandidateSearchError} from '.';\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:test');\n\ndescribe('candidate-search', () => {\n generateTests({\n callback,\n path: [__dirname, '..', '..', 'test-fixtures', 'candidate-search', 'index'],\n recurse: false,\n fixura: {\n reader: READERS.JSON\n }\n });\n\n // eslint-disable-next-line max-statements\n async function callback({getFixture, factoryOptions, searchOptions, expectedFactoryError, expectedSearchError, enabled = true}) {\n const url = 'http://foo.bar';\n\n if (!enabled) {\n return;\n }\n\n if (expectedFactoryError) {\n if (expectedFactoryError.isCandidateSearchError) {\n expect(() => createSearchInterface({...formatFactoryOptions(), url})).to.throw(CandidateSearchError, new RegExp(expectedFactoryError, 'u'));\n return;\n }\n\n expect(() => createSearchInterface({...formatFactoryOptions(), url})).to.throw(new RegExp(expectedFactoryError, 'u'));\n return;\n }\n\n const search = createSearchInterface({...formatFactoryOptions(), url});\n await iterate({searchOptions});\n\n function formatFactoryOptions() {\n debug(`Using factoryOptions: ${JSON.stringify(factoryOptions)}`);\n return {\n ...factoryOptions,\n maxRecordsPerRequest: factoryOptions.maxRecordsPerRequest || 1,\n maxServerResults: factoryOptions.maxServerResults || undefined,\n record: new MarcRecord(factoryOptions.record, {subfieldValues: false})\n };\n }\n\n // eslint-disable-next-line max-statements\n async function iterate({searchOptions, count = 1}) {\n const expectedResults = getFixture(`expectedResults${count}.json`);\n\n if (expectedSearchError) { // eslint-disable-line functional/no-conditional-statement\n try {\n await search(searchOptions);\n throw new Error('Expected an error');\n } catch (err) {\n expect(err).to.be.an('error');\n expect(err.message).to.match(new RegExp(expectedSearchError, 'u'));\n return;\n }\n }\n\n const results = await search(searchOptions);\n\n expect(formatResults(results)).to.eql(expectedResults);\n\n if (results.records.length > 0) {\n return iterate({\n searchOptions: resultsToOptions(results),\n count: count + 1\n });\n }\n\n function formatResults(results) {\n // console.log(results); //eslint-disable-line\n return {\n ...results,\n records: results.records.map(({record, id}) => ({id, record: record.toObject()}))\n };\n }\n\n function resultsToOptions(results) {\n return Object.entries(results)\n .filter(([k]) => k === 'records' === false) // If key is 'records' return false\n .reduce((acc, [k, v]) => ({...acc, [k]: v}), {});\n }\n }\n }\n});\n"],"file":"index.spec.js"}
|