@natlibfi/melinda-record-matching 4.2.0-alpha.1 → 4.2.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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.spec.js","names":["_fixugen","_interopRequireDefault","require","_fixura","_chai","_marcRecord","features","_interopRequireWildcard","_","_util","_debug","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","debug","createDebugLogger","debugData","extend","describe","generateTests","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","callback","getFixture","options","expectedResults","array","enabled","detect","createDetectionInterface","formatOptions","recordA","MarcRecord","subfieldValues","inspect","recordB","map","recordJson","results","stringify","expect","to","eql","contextFeatures","strategy","type","v"],"sources":["../../src/match-detection/index.spec.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 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 generateTests from '@natlibfi/fixugen';\nimport {READERS} from '@natlibfi/fixura';\nimport {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport * as features from './features';\nimport createDetectionInterface from '.';\nimport {inspect} from 'util';\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:match-detection:test');\nconst debugData = debug.extend('data');\n\ndescribe('match-detection', () => {\n generateTests({\n path: [__dirname, '..', '..', 'test-fixtures', 'match-detection', 'index'],\n useMetadataFile: true,\n recurse: false,\n fixura: {\n reader: READERS.JSON\n },\n callback: ({getFixture, options, expectedResults, array, enabled = true}) => {\n\n if (!enabled) {\n debug(`*** DISABLED TEST! ***`);\n return;\n }\n\n const detect = createDetectionInterface(formatOptions());\n const recordA = new MarcRecord(getFixture('recordA.json'), {subfieldValues: false});\n debugData(inspect(recordA));\n\n debug(`Our recordB is an array of records: ${array}`);\n const recordB = array\n ? getFixture('recordB.json').map(recordJson => new MarcRecord(recordJson, {subfieldValues: false}))\n : new MarcRecord(getFixture('recordB.json'), {subfieldValues: false});\n debugData(inspect(recordB));\n\n const results = detect({recordA, recordB});\n debugData(`${JSON.stringify(results)}`);\n\n expect(results).to.eql(expectedResults);\n\n function formatOptions() {\n const contextFeatures = features[options.strategy.type];\n\n return {\n ...options,\n strategy: options.strategy.features.map(v => contextFeatures[v]())\n };\n }\n }\n });\n});\n"],"mappings":"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"}
1
+ {"version":3,"file":"index.spec.js","names":["_fixugen","_interopRequireDefault","require","_fixura","_chai","_marcRecord","features","_interopRequireWildcard","_","_util","_debug","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","debug","createDebugLogger","debugData","extend","describe","generateTests","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","callback","getFixture","options","expectedResults","array","enabled","detect","createDetectionInterface","formatOptions","recordA","MarcRecord","subfieldValues","inspect","recordB","map","recordJson","results","stringify","expect","to","eql","contextFeatures","strategy","type","v"],"sources":["../../src/match-detection/index.spec.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 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 generateTests from '@natlibfi/fixugen';\nimport {READERS} from '@natlibfi/fixura';\nimport {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport * as features from './features';\nimport createDetectionInterface from '.';\nimport {inspect} from 'util';\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:match-detection:test');\nconst debugData = debug.extend('data');\n\ndescribe('match-detection', () => {\n generateTests({\n path: [__dirname, '..', '..', 'test-fixtures', 'match-detection', 'index'],\n useMetadataFile: true,\n recurse: false,\n fixura: {\n reader: READERS.JSON\n },\n callback: ({getFixture, options, expectedResults, array, enabled = true}) => {\n\n if (!enabled) {\n debug(`*** DISABLED TEST! ***`);\n return;\n }\n\n const detect = createDetectionInterface(formatOptions());\n const recordA = new MarcRecord(getFixture('recordA.json'), {subfieldValues: false});\n debugData(inspect(recordA));\n\n debug(`Our recordB is an array of records: ${array}`);\n const recordB = array\n ? getFixture('recordB.json').map(recordJson => new MarcRecord(recordJson, {subfieldValues: false}))\n : new MarcRecord(getFixture('recordB.json'), {subfieldValues: false});\n debugData(inspect(recordB));\n\n const results = detect({recordA, recordB});\n debugData(`${JSON.stringify(results)}`);\n\n expect(results).to.eql(expectedResults);\n\n function formatOptions() {\n const contextFeatures = features[options.strategy.type];\n\n return {\n ...options,\n strategy: options.strategy.features.map(v => contextFeatures[v]())\n };\n }\n }\n });\n});\n"],"mappings":"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"}
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": "4.2.0-alpha.1",
17
+ "version": "4.2.1-alpha.1",
18
18
  "main": "./dist/index.js",
19
19
  "engines": {
20
20
  "node": ">=18"
@@ -39,31 +39,31 @@
39
39
  "@natlibfi/marc-record": "^7.3.1",
40
40
  "@natlibfi/marc-record-serializers": "^10.1.1",
41
41
  "@natlibfi/melinda-commons": "^13.0.6",
42
- "@natlibfi/sru-client": "^6.0.4",
42
+ "@natlibfi/sru-client": "^6.0.5",
43
43
  "debug": "^4.3.4",
44
- "isbn3": "^1.1.40",
44
+ "isbn3": "^1.1.42",
45
45
  "moment": "^2.29.4",
46
- "natural": "^6.7.0",
47
- "uuid": "^9.0.0",
48
- "winston": "^3.10.0"
46
+ "natural": "^6.8.0",
47
+ "uuid": "^9.0.1",
48
+ "winston": "^3.11.0"
49
49
  },
50
50
  "devDependencies": {
51
- "@babel/cli": "^7.22.10",
52
- "@babel/core": "^7.22.11",
53
- "@babel/eslint-parser": "^7.22.11",
54
- "@babel/node": "^7.22.10",
55
- "@babel/preset-env": "^7.22.14",
56
- "@babel/register": "^7.22.5",
57
- "@natlibfi/eslint-config-melinda-backend": "^3.0.1",
51
+ "@babel/cli": "^7.23.0",
52
+ "@babel/core": "^7.23.2",
53
+ "@babel/eslint-parser": "^7.22.15",
54
+ "@babel/node": "^7.22.19",
55
+ "@babel/preset-env": "^7.23.2",
56
+ "@babel/register": "^7.22.15",
57
+ "@natlibfi/eslint-config-melinda-backend": "^3.0.2",
58
58
  "@natlibfi/fixugen": "^2.0.1",
59
59
  "@natlibfi/fixugen-http-client": "^3.0.0",
60
60
  "@natlibfi/fixura": "^3.0.1",
61
61
  "babel-plugin-istanbul": "^6.1.1",
62
62
  "babel-plugin-rewire": "^1.2.0",
63
- "chai": "^4.3.8",
63
+ "chai": "^4.3.10",
64
64
  "chai-as-promised": "^7.1.1",
65
65
  "cross-env": "^7.0.3",
66
- "eslint": "^8.48.0",
66
+ "eslint": "^8.51.0",
67
67
  "mocha": "^10.2.0",
68
68
  "nodemon": "^3.0.1",
69
69
  "nyc": "^15.1.0"
@@ -182,17 +182,6 @@ export function bibHostComponents(record) {
182
182
  // record is correctly catalogued using a filing indicator -> dc.title search won't match
183
183
 
184
184
  export function bibTitle(record) {
185
- // We get author/publisher only when formatted title is shorter than 5 chars
186
- return bibTitleAuthorPublisher({record, onlyTitleLength: 5});
187
- }
188
-
189
- export function bibTitleAuthor(record) {
190
- // We use onlyTitleLength that is longer than our formatted length to
191
- // get an author or an publisher always
192
- return bibTitleAuthorPublisher({record, onlyTitleLength: 100});
193
- }
194
-
195
- export function bibTitleAuthorPublisher({record, onlyTitleLength}) {
196
185
  const title = getTitle();
197
186
  const booleanStartWords = ['and', 'or', 'nor', 'not'];
198
187
 
@@ -207,38 +196,31 @@ export function bibTitleAuthorPublisher({record, onlyTitleLength}) {
207
196
 
208
197
  // use word search for titles starting with a boolean
209
198
  const useWordSearch = booleanStartWords.some(word => formatted.toLowerCase().startsWith(word));
210
- // Prevent too many matches / SRU crashing by having a minimum length
199
+ // Prevent too many matches by having a minimum length
211
200
  // Note that currently this fails matching if there are no matches from previous matchers
212
- if (formatted.length >= onlyTitleLength) {
201
+ if (formatted.length >= 5) {
213
202
  return [`dc.title="${useWordSearch ? '' : '^'}${formatted}*"`];
214
203
  }
215
- const queryIsOkAlone = formatted.length >= 5;
216
-
217
204
  // use word search without ending * also in combination searches to avoid SRU-server crashes [MRA-189]
218
- const query = `dc.title="${useWordSearch || !queryIsOkAlone ? '' : '^'}${formatted}${queryIsOkAlone ? '*' : ''}"`;
219
-
220
- return addAuthorsToSearch({query, queryIsOkAlone});
205
+ return addAuthorsToSearch(`dc.title="${formatted}"`);
221
206
  }
222
207
 
223
208
  return [];
224
209
 
225
- function addAuthorsToSearch({query, queryIsOkAlone = false}) {
210
+ function addAuthorsToSearch(titleQuery) {
226
211
  const [authorQuery] = bibAuthors(record);
227
212
  if (authorQuery !== undefined) {
228
- return [`${authorQuery} AND ${query}`];
213
+ return [`${authorQuery} AND ${titleQuery}`];
229
214
  }
230
- return addPublisherToSearch({query, queryIsOkAlone});
215
+ return addPublisherToSearch(titleQuery);
231
216
  //return [];
232
217
  }
233
218
 
234
- function addPublisherToSearch({query, queryIsOkAlone = false}) {
219
+ function addPublisherToSearch(query) {
235
220
  const [publisherQuery] = bibPublishers(record);
236
221
  if (publisherQuery !== undefined) {
237
222
  return [`${publisherQuery} AND ${query}`];
238
223
  }
239
- if (queryIsOkAlone) {
240
- return [`${query}`];
241
- }
242
224
  return [];
243
225
  }
244
226
 
@@ -286,6 +268,9 @@ export function bibAuthors(record) {
286
268
  if (formatted.length >= 5) {
287
269
  return [`dc.author="${useWordSearch ? '' : '^'}${formatted}*"`];
288
270
  }
271
+ //if (formatted) {
272
+ // return [`dc.author="${formatted}"`];
273
+ //}
289
274
  return [];
290
275
  }
291
276
 
@@ -32,8 +32,7 @@ export const searchTypes = {
32
32
  bib: {
33
33
  standardIdentifiers: 'bibStandardIdentifiers',
34
34
  hostComponents: 'bibHostComponents',
35
- title: 'bibTitle', // title ( + first author + first publisher if needed)
36
- titleAuthor: 'bibTitleAuthor', // title + first author (or first publisher if no author)
35
+ title: 'bibTitle',
37
36
  melindaId: 'bibMelindaIds',
38
37
  sourceIds: 'bibSourceIds'
39
38
  }