@natlibfi/melinda-record-matching 4.3.2-alpha.1 → 4.3.2-alpha.2
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.
|
@@ -125,16 +125,12 @@ var _default = ({
|
|
|
125
125
|
queryCounter = 0,
|
|
126
126
|
maxedQueries = []
|
|
127
127
|
}) => {
|
|
128
|
+
/*
|
|
128
129
|
if (queryListType === 'alternates') {
|
|
129
130
|
debug('Alternates - stop here');
|
|
130
|
-
return {
|
|
131
|
-
records: [],
|
|
132
|
-
failures: [],
|
|
133
|
-
queriesLeft: 0,
|
|
134
|
-
queryCounter,
|
|
135
|
-
maxedQueries
|
|
136
|
-
};
|
|
131
|
+
return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};
|
|
137
132
|
}
|
|
133
|
+
*/
|
|
138
134
|
const query = chosenQueryList[queryOffset];
|
|
139
135
|
debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);
|
|
140
136
|
if (query) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["_debug","_interopRequireDefault","require","_sruClient","_interopRequireWildcard","_marcRecord","_marcRecordSerializers","_queryList","_melindaCommons","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","CandidateSearchError","Error","exports","_default","record","searchSpec","url","maxCandidates","maxRecordsPerRequest","serverMaxResult","MarcRecord","setValidationOptions","subfieldValues","debug","createDebugLogger","debugData","extend","JSON","stringify","adjustedMaxRecordsPerRequest","inputRecordId","getRecordId","queryListResult","generateQueryList","queryList","queryListType","undefined","client","createClient","version","retrieveAll","chosenQueryList","choseQueries","length","queryOffset","resultSetOffset","totalRecords","searchCounter","queryCandidateCounter","queryCounter","maxedQueries","records","failures","queriesLeft","query","nextOffset","total","retrieveRecords","newTotalRecords","newQueryCounter","newSearchCounter","newQueryCandidateCounter","maxedQuery","checkMaxedQuery","newMaxedQueries","concat","Promise","resolve","reject","promises","searchRetrieve","startRecord","on","err","SruSearchError","recordPromises","allSettled","filtered","filter","status","map","value","reason","payload","recordXML","push","handleRecord","recordMarc","MARCXML","from","recordId","id","idFromXML","getRecordIdFromXML","message","MatchingError","data","field"],"sources":["../../src/candidate-search/index.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-2023 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';\nimport {Error as MatchingError} from '@natlibfi/melinda-commons';\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\nexport default ({record, searchSpec, url, maxCandidates, 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 debugData(`MaxCandidates: ${maxCandidates}`);\n\n // Do not retrieve more candidates than defined in maxCandidates\n const adjustedMaxRecordsPerRequest = maxRecordsPerRequest >= maxCandidates ? maxCandidates : maxRecordsPerRequest;\n\n const inputRecordId = getRecordId(record);\n const queryListResult = generateQueryList(record, searchSpec);\n const queryList = queryListResult[0]?.queryList ? queryListResult[0].queryList : queryListResult;\n const queryListType = queryListResult[0]?.queryListType ? queryListResult[0].queryListType : undefined;\n\n const client = createClient({\n url,\n maxRecordsPerRequest: adjustedMaxRecordsPerRequest,\n version: '2.0',\n retrieveAll: false\n });\n\n debug(`Searching matches for ${inputRecordId}`);\n const chosenQueryList = choseQueries(queryList, queryListType);\n\n // eslint-disable-next-line require-await\n function choseQueries(queryList, queryListType) {\n debug(`Generated queryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);\n\n // if generateQueryList errored we should throw 422\n if (queryList.length === 0) {\n throw new CandidateSearchError(`Generated query list contains no queries`);\n }\n\n if (queryListType && queryListType !== 'alternates') {\n throw new CandidateSearchError(`Generated query list has invalid type`);\n }\n\n if (queryListType === 'alternates' && queryList.length > 1) {\n //const [query] = queryList;\n //const totalResult = await retrieveTotal(query);\n // const totalsForQueries = queryList.map(query => retrieveTotal(query));\n //debug(`${JSON.stringify(totalResult)}`);\n return queryList;\n //return [];\n }\n return queryList;\n }\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 candidates (records+failures) retrieved from SRU for matching for current query, including the current record+failure 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 if (queryListType === 'alternates') {\n debug('Alternates - stop here');\n return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};\n }\n const query = chosenQueryList[queryOffset];\n debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);\n\n if (query) {\n const {records, failures, nextOffset, total} = await retrieveRecords();\n\n // If resultSetOffset === 1 this is the first search for the current query\n debugData(`ResultSetOffset: ${resultSetOffset}`);\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 + failures.length : queryCandidateCounter + records.length + failures.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, failures, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n }\n debug(`Query ${queryOffset} ${query} done.`);\n debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);\n return {records, failures, 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: [], failures: [], 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-statements\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 recordPromises = await Promise.allSettled(promises);\n debugData(`All recordPromises: ${JSON.stringify(recordPromises)}`);\n const filtered = recordPromises.filter(r => r.status === 'fulfilled').map(r => r.value);\n const failures = recordPromises.filter(r => r.status === 'rejected').map(r => ({status: r.reason.status, payload: r.reason.payload}));\n\n debug(`Found ${recordPromises.length} records`);\n debug(`Found ${filtered.length} convertable candidates`);\n debug(`Found ${failures.length} NON-convertable candidates`);\n debugData(`Converted: ${JSON.stringify(filtered)}.`);\n debugData(`Not converted: ${JSON.stringify(failures)}.`);\n\n\n resolve({nextOffset, records: filtered, failures, total: totalRecords});\n } catch (err) {\n debug(`Error caught on END`);\n reject(err);\n }\n })\n .on('record', recordXML => {\n promises.push(handleRecord()); // eslint-disable-line functional/immutable-data\n\n async function handleRecord() {\n try {\n const recordMarc = await MARCXML.from(recordXML, {subfieldValues: false});\n const recordId = getRecordId(recordMarc);\n\n return {record: recordMarc, id: recordId};\n } catch (err) {\n // What should this do?\n const idFromXML = getRecordIdFromXML(recordXML);\n debugData(`Failed converting record: ${err.message}, id: ${idFromXML}, data: ${recordXML}`);\n //return {message: `Failed converting record: ${err.message}`, id: idFromXML, data: recordXML};\n throw new MatchingError(422, {message: `Failed converting record: ${err.message}`, id: idFromXML || '000000000', data: recordXML});\n }\n }\n });\n });\n }\n };\n\n /*\n async function retrieveTotal(query) {\n debug(`Searching for candidateTotals with query: ${query}`);\n totalClient.searchRetrieve(query)\n .on('error', err => {\n // eslint-disable-next-line functional/no-conditional-statements\n if (err instanceof SruSearchError) {\n debug(`SRU SruSearchError for query: ${query}: ${err}`);\n throw new CandidateSearchError(`SRU SruSearchError for getting total for query: ${query}: ${err}`);\n }\n debug(`SRU error for query: ${query}: ${err}`);\n throw new CandidateSearchError(`SRU error for getting total for query: ${query}: ${err}`);\n })\n .on('total', total => {\n debug(`Got total: ${total}`);\n return {query, total};\n })\n .on('end', end => {\n debug(`End ${JSON.stringify(end)}`);\n });\n }\n*/\n\n\n function checkMaxedQuery(query, total, serverMaxResult) {\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 function getRecordId(record) {\n const [field] = record.get(/^001$/u);\n return field ? field.value : '';\n }\n\n function getRecordIdFromXML(recordXML) {\n //<controlfield tag=\\\"001\\\">015376846</controlfield\n debug(`Cannot yet find possible database record id from recordXML (length ${recordXML.length})`);\n return undefined;\n }\n\n};\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["_debug","_interopRequireDefault","require","_sruClient","_interopRequireWildcard","_marcRecord","_marcRecordSerializers","_queryList","_melindaCommons","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","CandidateSearchError","Error","exports","_default","record","searchSpec","url","maxCandidates","maxRecordsPerRequest","serverMaxResult","MarcRecord","setValidationOptions","subfieldValues","debug","createDebugLogger","debugData","extend","JSON","stringify","adjustedMaxRecordsPerRequest","inputRecordId","getRecordId","queryListResult","generateQueryList","queryList","queryListType","undefined","client","createClient","version","retrieveAll","chosenQueryList","choseQueries","length","queryOffset","resultSetOffset","totalRecords","searchCounter","queryCandidateCounter","queryCounter","maxedQueries","query","records","failures","nextOffset","total","retrieveRecords","newTotalRecords","newQueryCounter","newSearchCounter","newQueryCandidateCounter","maxedQuery","checkMaxedQuery","newMaxedQueries","concat","queriesLeft","Promise","resolve","reject","promises","searchRetrieve","startRecord","on","err","SruSearchError","recordPromises","allSettled","filtered","filter","status","map","value","reason","payload","recordXML","push","handleRecord","recordMarc","MARCXML","from","recordId","id","idFromXML","getRecordIdFromXML","message","MatchingError","data","field"],"sources":["../../src/candidate-search/index.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-2023 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';\nimport {Error as MatchingError} from '@natlibfi/melinda-commons';\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\nexport default ({record, searchSpec, url, maxCandidates, 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 debugData(`MaxCandidates: ${maxCandidates}`);\n\n // Do not retrieve more candidates than defined in maxCandidates\n const adjustedMaxRecordsPerRequest = maxRecordsPerRequest >= maxCandidates ? maxCandidates : maxRecordsPerRequest;\n\n const inputRecordId = getRecordId(record);\n const queryListResult = generateQueryList(record, searchSpec);\n const queryList = queryListResult[0]?.queryList ? queryListResult[0].queryList : queryListResult;\n const queryListType = queryListResult[0]?.queryListType ? queryListResult[0].queryListType : undefined;\n\n const client = createClient({\n url,\n maxRecordsPerRequest: adjustedMaxRecordsPerRequest,\n version: '2.0',\n retrieveAll: false\n });\n\n debug(`Searching matches for ${inputRecordId}`);\n const chosenQueryList = choseQueries(queryList, queryListType);\n\n // eslint-disable-next-line require-await\n function choseQueries(queryList, queryListType) {\n debug(`Generated queryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);\n\n // if generateQueryList errored we should throw 422\n if (queryList.length === 0) {\n throw new CandidateSearchError(`Generated query list contains no queries`);\n }\n\n if (queryListType && queryListType !== 'alternates') {\n throw new CandidateSearchError(`Generated query list has invalid type`);\n }\n\n if (queryListType === 'alternates' && queryList.length > 1) {\n //const [query] = queryList;\n //const totalResult = await retrieveTotal(query);\n // const totalsForQueries = queryList.map(query => retrieveTotal(query));\n //debug(`${JSON.stringify(totalResult)}`);\n return queryList;\n //return [];\n }\n return queryList;\n }\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 candidates (records+failures) retrieved from SRU for matching for current query, including the current record+failure 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\n /*\n if (queryListType === 'alternates') {\n debug('Alternates - stop here');\n return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};\n }\n */\n const query = chosenQueryList[queryOffset];\n debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);\n\n if (query) {\n const {records, failures, nextOffset, total} = await retrieveRecords();\n\n // If resultSetOffset === 1 this is the first search for the current query\n debugData(`ResultSetOffset: ${resultSetOffset}`);\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 + failures.length : queryCandidateCounter + records.length + failures.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, failures, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n }\n debug(`Query ${queryOffset} ${query} done.`);\n debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);\n return {records, failures, 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: [], failures: [], 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-statements\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 recordPromises = await Promise.allSettled(promises);\n debugData(`All recordPromises: ${JSON.stringify(recordPromises)}`);\n const filtered = recordPromises.filter(r => r.status === 'fulfilled').map(r => r.value);\n const failures = recordPromises.filter(r => r.status === 'rejected').map(r => ({status: r.reason.status, payload: r.reason.payload}));\n\n debug(`Found ${recordPromises.length} records`);\n debug(`Found ${filtered.length} convertable candidates`);\n debug(`Found ${failures.length} NON-convertable candidates`);\n debugData(`Converted: ${JSON.stringify(filtered)}.`);\n debugData(`Not converted: ${JSON.stringify(failures)}.`);\n\n\n resolve({nextOffset, records: filtered, failures, total: totalRecords});\n } catch (err) {\n debug(`Error caught on END`);\n reject(err);\n }\n })\n .on('record', recordXML => {\n promises.push(handleRecord()); // eslint-disable-line functional/immutable-data\n\n async function handleRecord() {\n try {\n const recordMarc = await MARCXML.from(recordXML, {subfieldValues: false});\n const recordId = getRecordId(recordMarc);\n\n return {record: recordMarc, id: recordId};\n } catch (err) {\n // What should this do?\n const idFromXML = getRecordIdFromXML(recordXML);\n debugData(`Failed converting record: ${err.message}, id: ${idFromXML}, data: ${recordXML}`);\n //return {message: `Failed converting record: ${err.message}`, id: idFromXML, data: recordXML};\n throw new MatchingError(422, {message: `Failed converting record: ${err.message}`, id: idFromXML || '000000000', data: recordXML});\n }\n }\n });\n });\n }\n };\n\n /*\n async function retrieveTotal(query) {\n debug(`Searching for candidateTotals with query: ${query}`);\n totalClient.searchRetrieve(query)\n .on('error', err => {\n // eslint-disable-next-line functional/no-conditional-statements\n if (err instanceof SruSearchError) {\n debug(`SRU SruSearchError for query: ${query}: ${err}`);\n throw new CandidateSearchError(`SRU SruSearchError for getting total for query: ${query}: ${err}`);\n }\n debug(`SRU error for query: ${query}: ${err}`);\n throw new CandidateSearchError(`SRU error for getting total for query: ${query}: ${err}`);\n })\n .on('total', total => {\n debug(`Got total: ${total}`);\n return {query, total};\n })\n .on('end', end => {\n debug(`End ${JSON.stringify(end)}`);\n });\n }\n*/\n\n\n function checkMaxedQuery(query, total, serverMaxResult) {\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 function getRecordId(record) {\n const [field] = record.get(/^001$/u);\n return field ? field.value : '';\n }\n\n function getRecordIdFromXML(recordXML) {\n //<controlfield tag=\\\"001\\\">015376846</controlfield\n debug(`Cannot yet find possible database record id from recordXML (length ${recordXML.length})`);\n return undefined;\n }\n\n};\n"],"mappings":";;;;;;;;;;;;AA4BA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,sBAAA,GAAAJ,OAAA;AACA,IAAAK,UAAA,GAAAH,uBAAA,CAAAF,OAAA;AACA,IAAAM,eAAA,GAAAN,OAAA;AAAiE,SAAAO,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAN,wBAAAM,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAjB,uBAAA6B,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAhB,UAAA,GAAAgB,GAAA,KAAAf,OAAA,EAAAe,GAAA;AAjCjE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAWO,MAAMC,oBAAoB,SAASC,KAAK,CAAC;;AAEhD;AAAAC,OAAA,CAAAF,oBAAA,GAAAA,oBAAA;AAAA,IAAAG,QAAA,GAEeA,CAAC;EAACC,MAAM;EAAEC,UAAU;EAAEC,GAAG;EAAEC,aAAa;EAAEC,oBAAoB,GAAG,EAAE;EAAEC,eAAe,GAAG;AAAK,CAAC,KAAK;EAC/GC,sBAAU,CAACC,oBAAoB,CAAC;IAACC,cAAc,EAAE;EAAK,CAAC,CAAC;EAExD,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,oDAAoD,CAAC;EACrF,MAAMC,SAAS,GAAGF,KAAK,CAACG,MAAM,CAAC,MAAM,CAAC;EAEtCD,SAAS,CAAE,eAAcE,IAAI,CAACC,SAAS,CAACb,UAAU,CAAE,EAAC,CAAC;EACtDU,SAAS,CAAE,QAAOT,GAAI,EAAC,CAAC;EACxBS,SAAS,CAAE,wBAAuBP,oBAAqB,EAAC,CAAC;EACzDO,SAAS,CAAE,oBAAmBN,eAAgB,EAAC,CAAC;EAChDM,SAAS,CAAE,kBAAiBR,aAAc,EAAC,CAAC;;EAE5C;EACA,MAAMY,4BAA4B,GAAGX,oBAAoB,IAAID,aAAa,GAAGA,aAAa,GAAGC,oBAAoB;EAEjH,MAAMY,aAAa,GAAGC,WAAW,CAACjB,MAAM,CAAC;EACzC,MAAMkB,eAAe,GAAG,IAAAC,kBAAiB,EAACnB,MAAM,EAAEC,UAAU,CAAC;EAC7D,MAAMmB,SAAS,GAAGF,eAAe,CAAC,CAAC,CAAC,EAAEE,SAAS,GAAGF,eAAe,CAAC,CAAC,CAAC,CAACE,SAAS,GAAGF,eAAe;EAChG,MAAMG,aAAa,GAAGH,eAAe,CAAC,CAAC,CAAC,EAAEG,aAAa,GAAGH,eAAe,CAAC,CAAC,CAAC,CAACG,aAAa,GAAGC,SAAS;EAEtG,MAAMC,MAAM,GAAG,IAAAC,kBAAY,EAAC;IAC1BtB,GAAG;IACHE,oBAAoB,EAAEW,4BAA4B;IAClDU,OAAO,EAAE,KAAK;IACdC,WAAW,EAAE;EACf,CAAC,CAAC;EAEFjB,KAAK,CAAE,yBAAwBO,aAAc,EAAC,CAAC;EAC/C,MAAMW,eAAe,GAAGC,YAAY,CAACR,SAAS,EAAEC,aAAa,CAAC;;EAE9D;EACA,SAASO,YAAYA,CAACR,SAAS,EAAEC,aAAa,EAAE;IAC9CZ,KAAK,CAAE,8BAA6BY,aAAc,KAAIR,IAAI,CAACC,SAAS,CAACM,SAAS,CAAE,EAAC,CAAC;;IAElF;IACA,IAAIA,SAAS,CAACS,MAAM,KAAK,CAAC,EAAE;MAC1B,MAAM,IAAIjC,oBAAoB,CAAE,0CAAyC,CAAC;IAC5E;IAEA,IAAIyB,aAAa,IAAIA,aAAa,KAAK,YAAY,EAAE;MACnD,MAAM,IAAIzB,oBAAoB,CAAE,uCAAsC,CAAC;IACzE;IAEA,IAAIyB,aAAa,KAAK,YAAY,IAAID,SAAS,CAACS,MAAM,GAAG,CAAC,EAAE;MAC1D;MACA;MACA;MACA;MACA,OAAOT,SAAS;MAChB;IACF;IACA,OAAOA,SAAS;EAClB;;EAGA;EACA;EACA;EACA;EACA;EACA;EACA;;EAGA;EACA,OAAO,OAAO;IAACU,WAAW,GAAG,CAAC;IAAEC,eAAe,GAAG,CAAC;IAAEC,YAAY,GAAG,CAAC;IAAEC,aAAa,GAAG,CAAC;IAAEC,qBAAqB,GAAG,CAAC;IAAEC,YAAY,GAAG,CAAC;IAAEC,YAAY,GAAG;EAAE,CAAC,KAAK;IAE5J;AACJ;AACA;AACA;AACA;AACA;IACI,MAAMC,KAAK,GAAGV,eAAe,CAACG,WAAW,CAAC;IAC1CrB,KAAK,CAAE,iBAAgBI,IAAI,CAACC,SAAS,CAACuB,KAAK,CAAE,KAAIP,WAAY,GAAE,CAAC;IAEhE,IAAIO,KAAK,EAAE;MACT,MAAM;QAACC,OAAO;QAAEC,QAAQ;QAAEC,UAAU;QAAEC;MAAK,CAAC,GAAG,MAAMC,eAAe,CAAC,CAAC;;MAEtE;MACA/B,SAAS,CAAE,oBAAmBoB,eAAgB,EAAC,CAAC;MAChD,MAAMY,eAAe,GAAGZ,eAAe,KAAK,CAAC,GAAGU,KAAK,GAAGT,YAAY;MACpE,MAAMY,eAAe,GAAGb,eAAe,KAAK,CAAC,GAAGI,YAAY,GAAG,CAAC,GAAGA,YAAY;MAC/E,MAAMU,gBAAgB,GAAGd,eAAe,KAAK,CAAC,GAAG,CAAC,GAAGE,aAAa,GAAG,CAAC;MACtE,MAAMa,wBAAwB,GAAGf,eAAe,KAAK,CAAC,GAAGO,OAAO,CAACT,MAAM,GAAGU,QAAQ,CAACV,MAAM,GAAGK,qBAAqB,GAAGI,OAAO,CAACT,MAAM,GAAGU,QAAQ,CAACV,MAAM;MAEpJ,MAAMkB,UAAU,GAAGhB,eAAe,KAAK,CAAC,GAAGiB,eAAe,CAACX,KAAK,EAAEI,KAAK,EAAEpC,eAAe,CAAC,GAAGiB,SAAS;MACrG,MAAM2B,eAAe,GAAGF,UAAU,GAAGX,YAAY,CAACc,MAAM,CAACH,UAAU,CAAC,GAAGX,YAAY;MAEnF,IAAI,OAAOI,UAAU,KAAK,QAAQ,EAAE;QAClC/B,KAAK,CAAE,iCAAgCqB,WAAY,IAAGO,KAAM,0BAAyBG,UAAW,EAAC,CAAC;QAClG,OAAO;UAACF,OAAO;UAAEC,QAAQ;UAAET,WAAW;UAAEC,eAAe,EAAES,UAAU;UAAEW,WAAW,EAAE/B,SAAS,CAACS,MAAM,IAAIC,WAAW,GAAG,CAAC,CAAC;UAAEE,YAAY,EAAEW,eAAe;UAAEN,KAAK;UAAEJ,aAAa,EAAEY,gBAAgB;UAAEX,qBAAqB,EAAEY,wBAAwB;UAAEX,YAAY,EAAES,eAAe;UAAER,YAAY,EAAEa;QAAe,CAAC;MAC/S;MACAxC,KAAK,CAAE,SAAQqB,WAAY,IAAGO,KAAM,QAAO,CAAC;MAC5C5B,KAAK,CAAE,cAAaW,SAAS,CAACS,MAAM,IAAIC,WAAW,GAAG,CAAC,CAAE,gBAAe,CAAC;MACzE,OAAO;QAACQ,OAAO;QAAEC,QAAQ;QAAET,WAAW,EAAEA,WAAW,GAAG,CAAC;QAAEqB,WAAW,EAAE/B,SAAS,CAACS,MAAM,IAAIC,WAAW,GAAG,CAAC,CAAC;QAAEE,YAAY,EAAEW,eAAe;QAAEN,KAAK;QAAEJ,aAAa,EAAEY,gBAAgB;QAAEX,qBAAqB,EAAEY,wBAAwB;QAAEX,YAAY,EAAES,eAAe;QAAER,YAAY,EAAEa;MAAe,CAAC;IACnS;IAEAxC,KAAK,CAAE,OAAMW,SAAS,CAACS,MAAO,uCAAsCC,WAAY,EAAC,CAAC;IAClF,OAAO;MAACQ,OAAO,EAAE,EAAE;MAAEC,QAAQ,EAAE,EAAE;MAAEY,WAAW,EAAE,CAAC;MAAEhB,YAAY;MAAEC;IAAY,CAAC;IAE9E,SAASM,eAAeA,CAAA,EAAG;MACzB,OAAO,IAAIU,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;QACtC,MAAMC,QAAQ,GAAG,EAAE;QACnB;QACA,IAAIvB,YAAY,GAAG,CAAC;QAEpBvB,KAAK,CAAE,wCAAuC4B,KAAM,YAAWN,eAAgB,GAAE,CAAC;QAElFR,MAAM,CAACiC,cAAc,CAACnB,KAAK,EAAE;UAACoB,WAAW,EAAE1B;QAAe,CAAC,CAAC,CACzD2B,EAAE,CAAC,OAAO,EAAEC,GAAG,IAAI;UAClB;UACA,IAAIA,GAAG,YAAYC,yBAAc,EAAE;YACjCnD,KAAK,CAAE,iCAAgC4B,KAAM,KAAIsB,GAAI,EAAC,CAAC;YACvDL,MAAM,CAAC,IAAI1D,oBAAoB,CAAE,iCAAgCyC,KAAM,KAAIsB,GAAI,EAAC,CAAC,CAAC;UACpF;UACAlD,KAAK,CAAE,wBAAuB4B,KAAM,KAAIsB,GAAI,EAAC,CAAC;UAC9CL,MAAM,CAAC,IAAI1D,oBAAoB,CAAE,wBAAuByC,KAAM,KAAIsB,GAAI,EAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CACDD,EAAE,CAAC,OAAO,EAAEjB,KAAK,IAAI;UACpBhC,KAAK,CAAE,cAAagC,KAAM,EAAC,CAAC;UAC5BT,YAAY,IAAIS,KAAK;QACvB,CAAC,CAAC,CACDiB,EAAE,CAAC,KAAK,EAAE,MAAMlB,UAAU,IAAI;UAC7B,IAAI;YACF,MAAMqB,cAAc,GAAG,MAAMT,OAAO,CAACU,UAAU,CAACP,QAAQ,CAAC;YACzD5C,SAAS,CAAE,uBAAsBE,IAAI,CAACC,SAAS,CAAC+C,cAAc,CAAE,EAAC,CAAC;YAClE,MAAME,QAAQ,GAAGF,cAAc,CAACG,MAAM,CAACvF,CAAC,IAAIA,CAAC,CAACwF,MAAM,KAAK,WAAW,CAAC,CAACC,GAAG,CAACzF,CAAC,IAAIA,CAAC,CAAC0F,KAAK,CAAC;YACvF,MAAM5B,QAAQ,GAAGsB,cAAc,CAACG,MAAM,CAACvF,CAAC,IAAIA,CAAC,CAACwF,MAAM,KAAK,UAAU,CAAC,CAACC,GAAG,CAACzF,CAAC,KAAK;cAACwF,MAAM,EAAExF,CAAC,CAAC2F,MAAM,CAACH,MAAM;cAAEI,OAAO,EAAE5F,CAAC,CAAC2F,MAAM,CAACC;YAAO,CAAC,CAAC,CAAC;YAErI5D,KAAK,CAAE,SAAQoD,cAAc,CAAChC,MAAO,UAAS,CAAC;YAC/CpB,KAAK,CAAE,SAAQsD,QAAQ,CAAClC,MAAO,yBAAwB,CAAC;YACxDpB,KAAK,CAAE,SAAQ8B,QAAQ,CAACV,MAAO,6BAA4B,CAAC;YAC5DlB,SAAS,CAAE,cAAaE,IAAI,CAACC,SAAS,CAACiD,QAAQ,CAAE,GAAE,CAAC;YACpDpD,SAAS,CAAE,kBAAiBE,IAAI,CAACC,SAAS,CAACyB,QAAQ,CAAE,GAAE,CAAC;YAGxDc,OAAO,CAAC;cAACb,UAAU;cAAEF,OAAO,EAAEyB,QAAQ;cAAExB,QAAQ;cAAEE,KAAK,EAAET;YAAY,CAAC,CAAC;UACzE,CAAC,CAAC,OAAO2B,GAAG,EAAE;YACZlD,KAAK,CAAE,qBAAoB,CAAC;YAC5B6C,MAAM,CAACK,GAAG,CAAC;UACb;QACF,CAAC,CAAC,CACDD,EAAE,CAAC,QAAQ,EAAEY,SAAS,IAAI;UACzBf,QAAQ,CAACgB,IAAI,CAACC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;;UAE/B,eAAeA,YAAYA,CAAA,EAAG;YAC5B,IAAI;cACF,MAAMC,UAAU,GAAG,MAAMC,8BAAO,CAACC,IAAI,CAACL,SAAS,EAAE;gBAAC9D,cAAc,EAAE;cAAK,CAAC,CAAC;cACzE,MAAMoE,QAAQ,GAAG3D,WAAW,CAACwD,UAAU,CAAC;cAExC,OAAO;gBAACzE,MAAM,EAAEyE,UAAU;gBAAEI,EAAE,EAAED;cAAQ,CAAC;YAC3C,CAAC,CAAC,OAAOjB,GAAG,EAAE;cACZ;cACA,MAAMmB,SAAS,GAAGC,kBAAkB,CAACT,SAAS,CAAC;cAC/C3D,SAAS,CAAE,6BAA4BgD,GAAG,CAACqB,OAAQ,SAAQF,SAAU,WAAUR,SAAU,EAAC,CAAC;cAC3F;cACA,MAAM,IAAIW,qBAAa,CAAC,GAAG,EAAE;gBAACD,OAAO,EAAG,6BAA4BrB,GAAG,CAACqB,OAAQ,EAAC;gBAAEH,EAAE,EAAEC,SAAS,IAAI,WAAW;gBAAEI,IAAI,EAAEZ;cAAS,CAAC,CAAC;YACpI;UACF;QACF,CAAC,CAAC;MACN,CAAC,CAAC;IACJ;EACF,CAAC;;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;EAGE,SAAStB,eAAeA,CAACX,KAAK,EAAEI,KAAK,EAAEpC,eAAe,EAAE;IACtD,IAAIoC,KAAK,IAAIpC,eAAe,EAAE;MAC5BI,KAAK,CAAE,kBAAiB4B,KAAM,gBAAeI,KAAM,0CAAyCpC,eAAgB,IAAG,CAAC;MAChH,OAAOgC,KAAK;IACd;EACF;EAEA,SAASpB,WAAWA,CAACjB,MAAM,EAAE;IAC3B,MAAM,CAACmF,KAAK,CAAC,GAAGnF,MAAM,CAAClB,GAAG,CAAC,QAAQ,CAAC;IACpC,OAAOqG,KAAK,GAAGA,KAAK,CAAChB,KAAK,GAAG,EAAE;EACjC;EAEA,SAASY,kBAAkBA,CAACT,SAAS,EAAE;IACrC;IACA7D,KAAK,CAAE,sEAAqE6D,SAAS,CAACzC,MAAO,GAAE,CAAC;IAChG,OAAOP,SAAS;EAClB;AAEF,CAAC;AAAAxB,OAAA,CAAAlB,OAAA,GAAAmB,QAAA"}
|
package/package.json
CHANGED
|
@@ -105,10 +105,13 @@ export default ({record, searchSpec, url, maxCandidates, maxRecordsPerRequest =
|
|
|
105
105
|
|
|
106
106
|
// eslint-disable-next-line max-statements
|
|
107
107
|
return async ({queryOffset = 0, resultSetOffset = 1, totalRecords = 0, searchCounter = 0, queryCandidateCounter = 0, queryCounter = 0, maxedQueries = []}) => {
|
|
108
|
+
|
|
109
|
+
/*
|
|
108
110
|
if (queryListType === 'alternates') {
|
|
109
111
|
debug('Alternates - stop here');
|
|
110
112
|
return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};
|
|
111
113
|
}
|
|
114
|
+
*/
|
|
112
115
|
const query = chosenQueryList[queryOffset];
|
|
113
116
|
debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);
|
|
114
117
|
|