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

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

@@ -1,28 +1,22 @@
 "use strict";
 
 var _chai = require("chai");
-
 var _fixura = require("@natlibfi/fixura");
-
 var _fixugenHttpClient = _interopRequireDefault(require("@natlibfi/fixugen-http-client"));
-
 var _marcRecord = require("@natlibfi/marc-record");
-
+var _melindaCommons = require("@natlibfi/melinda-commons");
 var _ = _interopRequireWildcard(require("."));
-
+var _debug = _interopRequireDefault(require("debug"));
 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); }
-
 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; }
-
 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
 *
@@ -43,6 +37,8 @@ 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:candidate-search:test');
 describe('candidate-search', () => {
   (0, _fixugenHttpClient.default)({
     callback,
@@ -51,84 +47,88 @@ describe('candidate-search', () => {
     fixura: {
       reader: _fixura.READERS.JSON
     }
-  }); // eslint-disable-next-line max-statements
-
+  });
   async function callback({
     getFixture,
     factoryOptions,
     searchOptions,
-    expectedFactoryError,
-    expectedSearchError,
+    expectedFactoryError = false,
+    expectedSearchError = false,
     enabled = true
   }) {
     const url = 'http://foo.bar';
-
     if (!enabled) {
       return;
     }
-
     if (expectedFactoryError) {
       if (expectedFactoryError.isCandidateSearchError) {
-        (0, _chai.expect)(() => (0, _.default)({ ...formatFactoryOptions(),
+        (0, _chai.expect)(() => (0, _.default)({
+          ...formatFactoryOptions(),
           url
         })).to.throw(_.CandidateSearchError, new RegExp(expectedFactoryError, 'u'));
         return;
       }
-
-      (0, _chai.expect)(() => (0, _.default)({ ...formatFactoryOptions(),
+      (0, _chai.expect)(() => (0, _.default)({
+        ...formatFactoryOptions(),
         url
       })).to.throw(new RegExp(expectedFactoryError, 'u'));
       return;
     }
-
-    const search = (0, _.default)({ ...formatFactoryOptions(),
+    const search = (0, _.default)({
+      ...formatFactoryOptions(),
       url
     });
     await iterate({
-      searchOptions
+      searchOptions,
+      expectedSearchError
     });
-
     function formatFactoryOptions() {
-      return { ...factoryOptions,
-        maxRecordsPerRequest: 1,
+      debug(`Using factoryOptions: ${JSON.stringify(factoryOptions)}`);
+      return {
+        ...factoryOptions,
+        maxRecordsPerRequest: factoryOptions.maxRecordsPerRequest || 1,
+        maxServerResults: factoryOptions.maxServerResults || undefined,
         record: new _marcRecord.MarcRecord(factoryOptions.record, {
           subfieldValues: false
         })
       };
-    } // eslint-disable-next-line max-statements
-
-
+    }
     async function iterate({
       searchOptions,
+      expectedSearchError,
+      expectedErrorStatus,
       count = 1
     }) {
       const expectedResults = getFixture(`expectedResults${count}.json`);
-
       if (expectedSearchError) {
-        // eslint-disable-line functional/no-conditional-statement
+        // eslint-disable-line functional/no-conditional-statements
         try {
           await search(searchOptions);
           throw new Error('Expected an error');
         } catch (err) {
+          debug(`Got an error: ${err}`);
           (0, _chai.expect)(err).to.be.an('error');
-          (0, _chai.expect)(err.message).to.match(new RegExp(expectedSearchError, 'u'));
+          const errorMessage = err instanceof _melindaCommons.Error ? err.payload.message : err.message;
+          const errorStatus = err instanceof _melindaCommons.Error ? err.status : undefined;
+          debug(`errorMessage: ${errorMessage}, errorStatus: ${errorStatus}`);
+          (0, _chai.expect)(errorMessage).to.match(new RegExp(expectedSearchError, 'u'));
+          if (expectedErrorStatus) {
+            (0, _chai.expect)(errorStatus).to.be(expectedErrorStatus);
+            return;
+          }
           return;
         }
       }
 
-      const results = await search(searchOptions);
-      (0, _chai.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);
+        (0, _chai.expect)(formatResults(results)).to.eql(expectedResults);
       }
-
       function formatResults(results) {
-        // console.log(results); //eslint-disable-line
-        return { ...results,
+        debug(results);
+        return {
+          ...results,
           records: results.records.map(({
             record,
             id
@@ -138,13 +138,6 @@ describe('candidate-search', () => {
           }))
         };
       }
-
-      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
-        }), {});
-      }
     }
   }
 });

package/dist/candidate-search/index.spec.js.map

@@ -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":"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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 {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 '.';\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      return {\n        ...factoryOptions,\n        maxRecordsPerRequest: 1,\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"}
+{"version":3,"file":"index.spec.js","names":["_chai","require","_fixura","_fixugenHttpClient","_interopRequireDefault","_marcRecord","_melindaCommons","_","_interopRequireWildcard","_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","describe","generateTests","callback","path","__dirname","recurse","fixura","reader","READERS","JSON","getFixture","factoryOptions","searchOptions","expectedFactoryError","expectedSearchError","enabled","url","isCandidateSearchError","expect","createSearchInterface","formatFactoryOptions","to","throw","CandidateSearchError","RegExp","search","iterate","stringify","maxRecordsPerRequest","maxServerResults","undefined","record","MarcRecord","subfieldValues","expectedErrorStatus","count","expectedResults","Error","err","be","an","errorMessage","MatchingError","payload","message","errorStatus","status","match","results","formatResults","eql","records","map","id","toObject"],"sources":["../../src/candidate-search/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-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 {Error as MatchingError} from '@natlibfi/melinda-commons';\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  async function callback({getFixture, factoryOptions, searchOptions, expectedFactoryError = false, expectedSearchError = false, 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, expectedSearchError});\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    async function iterate({searchOptions, expectedSearchError, expectedErrorStatus, count = 1}) {\n      const expectedResults = getFixture(`expectedResults${count}.json`);\n\n      if (expectedSearchError) { // eslint-disable-line functional/no-conditional-statements\n        try {\n          await search(searchOptions);\n          throw new Error('Expected an error');\n        } catch (err) {\n          debug(`Got an error: ${err}`);\n          expect(err).to.be.an('error');\n          const errorMessage = err instanceof MatchingError ? err.payload.message : err.message;\n          const errorStatus = err instanceof MatchingError ? err.status : undefined;\n          debug(`errorMessage: ${errorMessage}, errorStatus: ${errorStatus}`);\n          expect(errorMessage).to.match(new RegExp(expectedSearchError, 'u'));\n\n          if (expectedErrorStatus) {\n            expect(errorStatus).to.be(expectedErrorStatus);\n            return;\n          }\n          return;\n        }\n      }\n\n      // eslint-disable-next-line functional/no-conditional-statements\n      if (!expectedSearchError) {\n        const results = await search(searchOptions);\n        expect(formatResults(results)).to.eql(expectedResults);\n      }\n\n      function formatResults(results) {\n        debug(results);\n        return {\n          ...results,\n          records: results.records.map(({record, id}) => ({id, record: record.toObject()}))\n        };\n      }\n\n    }\n  }\n});\n"],"mappings":"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"}

package/dist/candidate-search/query-list/bib.js

@@ -3,27 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.bibAuthors = bibAuthors;
 exports.bibHostComponents = bibHostComponents;
 exports.bibMelindaIds = bibMelindaIds;
+exports.bibPublishers = bibPublishers;
 exports.bibSourceIds = bibSourceIds;
 exports.bibStandardIdentifiers = bibStandardIdentifiers;
 exports.bibTitle = bibTitle;
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _candidateSearchUtils = require("../candidate-search-utils");
-
 var _matchingUtils = require("../../matching-utils");
-
 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
 *
@@ -44,6 +41,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 * for the JavaScript code in this file.
 *
 */
+
 function bibSourceIds(record) {
   /* Melinda's SRU-index melinda.sourceid includes source IDs from SID fields in Melinda records
      SID-fields in Melinda have sf $c with local id and sf $b with a code for the local db:
@@ -62,36 +60,33 @@ function bibSourceIds(record) {
           afterwards. SIDs are also not reliably maintained. A record might or might not have a SID for a local db
           after the matching record is removed from the local db.
     */
+
   const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:query:source-ids');
-  const debugData = debug.extend('data'); //const debugInfo = debug.extend('info');
+  const debugData = debug.extend('data');
+  //const debugInfo = debug.extend('info');
 
   debug(`Creating queries for sourceid's`);
   const fSids = record.get('SID');
   debugData(`SID-fields (${fSids.length}): ${JSON.stringify(fSids)}`);
   return fSids.length > 0 ? toSidQueries(fSids) : [];
-
   function toSidQueries(fSids) {
     debug(`Creating actual queries for sourceid's`);
     const sidStrings = getSidStrings(fSids);
-
     if (sidStrings.length < 1) {
       debug(`No identifiers found, no queries created.`);
       return [];
     }
-
     const sidQueries = (0, _candidateSearchUtils.toQueries)(sidStrings, 'melinda.sourceid');
     return sidQueries;
-
     function getSidStrings(fSids) {
-      debug(`Getting Sid strings from SID fields`); // Map SID fields to valid sidStrings, filter out empty strings
+      debug(`Getting Sid strings from SID fields`);
 
+      // Map SID fields to valid sidStrings, filter out empty strings
       const sidStrings = fSids.map(toSidString).filter(nonEmptySid => nonEmptySid);
       return sidStrings;
-
       function toSidString(field) {
         debug(`Getting string from a field`);
         return (0, _matchingUtils.validateSidFieldSubfieldCounts)(field) ? createSidString(field) : '';
-
         function createSidString(field) {
           debug(`Creating string from a field`);
           const [sfC] = (0, _matchingUtils.getSubfieldValues)(field, 'c');
@@ -101,148 +96,243 @@ function bibSourceIds(record) {
           debugData(`${JSON.stringify(sfC)} + ${JSON.stringify(sfB)}`);
           return cleanedSfC.concat(cleanedSfB);
         }
-
         function removeSourcePrefix(subfieldValue) {
           const sourcePrefixRegex = /^(?<sourcePrefix>\([A-Za-z0-9-]+\))(?<id>.+)$/u;
-          const normalizedValue = subfieldValue.replace(sourcePrefixRegex, '$<id>');
+          const normalizedValue = (0, _matchingUtils.testStringOrNumber)(subfieldValue) ? String(subfieldValue).replace(sourcePrefixRegex, '$<id>') : '';
           debugData(`Normalized ${subfieldValue} to ${normalizedValue}`);
           return normalizedValue;
         }
-
         function normalizeSidSubfieldValue(subfieldValue) {
           debugData(`Normalizing ${subfieldValue}`);
           const normalizeAwayRegex = /[- ]/u;
-          return subfieldValue.replace(normalizeAwayRegex, '');
+          return (0, _matchingUtils.testStringOrNumber)(subfieldValue) ? String(subfieldValue).replace(normalizeAwayRegex, '') : '';
         }
       }
     }
   }
 }
-
 function bibMelindaIds(record) {
   // Melinda's SRU-index melinda.melindaid includes f001 controlnumbers and old Melinda-IDs from f035z's for all non-deleted Melinda-records
+
   const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:query:bibMelindaIds');
   const debugData = debug.extend('data');
-  debug(`Creating queries for MelindaIds`); // Note: Melinda-ID's for search queries are created just from records f035a's and f035z's
+  debug(`Creating queries for MelindaIds`);
+
+  // Note: Melinda-ID's for search queries are created just from records f035a's and f035z's
   // Both (FI-MELINDA)- and FCC-prefixed forms are found
   // f001 controlnumber is not currently included, even if record's f003 is FI-MELINDA
-
   const melindaIds = (0, _matchingUtils.getMelindaIdsF035)(record);
   debugData(`Unique identifiers (${melindaIds.length}): ${JSON.stringify(melindaIds)}`);
-
   if (melindaIds.length < 1) {
     debug(`No identifiers found, no queries created.`);
     return [];
   }
-
   return (0, _candidateSearchUtils.toQueries)(melindaIds, 'melinda.melindaid');
-} // bibHostComponents returns host id from the first subfield $w of first field f773, see test-fixtures 04 and 05
-// bibHostComponents should search all 773 $ws for possible host id, but what should it do in case of multiple host ids?
-
+}
 
+// bibHostComponents returns host id from the first subfield $w of first field f773, see test-fixtures 04 and 05
+// bibHostComponents should search all 773 $ws for possible host id, but what should it do in case of multiple host ids?
 function bibHostComponents(record) {
   const id = getHostId();
-  return id ? [`melinda.partsofhost=${id}`] : [];
-
+  return (0, _matchingUtils.testStringOrNumber)(id) ? [`melinda.partsofhost=${id}`] : [];
   function getHostId() {
     const [field] = record.get(/^773$/u);
-
     if (field) {
       const {
         value
       } = field.subfields.find(({
         code
       }) => code === 'w') || {};
-
-      if (value && /^\(FI-MELINDA\)/u.test(value)) {
-        return value.replace(/^\(FI-MELINDA\)/u, '');
+      if ((0, _matchingUtils.testStringOrNumber)(value) && /^\(FI-MELINDA\)/u.test(String(value))) {
+        return String(value).replace(/^\(FI-MELINDA\)/u, '');
       }
-
-      if (value && /^\(FIN01\)/u.test(value)) {
-        return value.replace(/^\(FIN01\)/u, '');
+      if ((0, _matchingUtils.testStringOrNumber)(value) && /^\(FIN01\)/u.test(String(value))) {
+        return String(value).replace(/^\(FIN01\)/u, '');
       }
-
       return false;
     }
-
     return false;
   }
-} // SRU search dc.title with a search phrase starting with ^ maps currently in Melinda to
+}
+
+// SRU search dc.title with a search phrase starting with ^ maps currently in Melinda to
 // (probably) to *headings* index TIT
+// - Aleph cannot currently handle headings searches starting with a boolean - in these cases use word search
+
 // Headings index TIT drops articles etc. from the start of the title according to the filing indicator
 // Currently filing indicator is not implemented - if the title starts with an article and the Melinda
 // record is correctly catalogued using a filing indicator -> dc.title search won't match
 
-
 function bibTitle(record) {
   const title = getTitle();
-
-  if (title) {
-    const formatted = title.replace(/[^\w\s\p{Alphabetic}]/gu, '') // Clean up concurrent spaces from fe. subfield changes
-    .replace(/ +/gu, ' ').trim().slice(0, 30).trim(); // Prevent too many matches by having a minimum length requirement
-
-    return formatted.length >= 5 ? [`dc.title="^${formatted}*"`] : [];
+  const booleanStartWords = ['and', 'or', 'nor', 'not'];
+  if ((0, _matchingUtils.testStringOrNumber)(title)) {
+    const formatted = String(title).replace(/[^\w\s\p{Alphabetic}]/gu, '')
+    // Clean up concurrent spaces from fe. subfield changes
+    .replace(/ +/gu, ' ').trim().slice(0, 30).trim();
+
+    // use word search for titles starting with a boolean
+    const useWordSearch = booleanStartWords.some(word => formatted.toLowerCase().startsWith(word));
+    // Prevent too many matches by having a minimum length
+    // Note that currently this fails matching if there are no matches from previous matchers
+    if (formatted.length >= 5) {
+      return [`dc.title="${useWordSearch ? '' : '^'}${formatted}*"`];
+    }
+    // use word search without ending * also in combination searches to avoid SRU-server crashes [MRA-189]
+    return addAuthorsToSearch(`dc.title="${formatted}"`);
   }
-
   return [];
+  function addAuthorsToSearch(titleQuery) {
+    const [authorQuery] = bibAuthors(record);
+    if (authorQuery !== undefined) {
+      return [`${authorQuery} AND ${titleQuery}`];
+    }
+    return addPublisherToSearch(titleQuery);
+    //return [];
+  }
 
+  function addPublisherToSearch(query) {
+    const [publisherQuery] = bibPublishers(record);
+    if (publisherQuery !== undefined) {
+      return [`${publisherQuery} AND ${query}`];
+    }
+    return [];
+  }
   function getTitle() {
     const [field] = record.get(/^245$/u);
-
     if (field) {
-      return field.subfields.filter(({
+      const titleString = field.subfields
+      //.filter(({code}) => ['a', 'b', 'n', 'p'].includes(code))
+      .filter(({
         code
-      }) => ['a', 'b'].includes(code)).map(({
+      }) => ['a', 'b'].includes(code))
+      //.filter(({code}) => ['a'].includes(code))
+      .map(({
         value
-      }) => value) // In Melinda's index subfield separators are indexed as ' '
+      }) => (0, _matchingUtils.testStringOrNumber)(value) ? String(value) : '').filter(value => value)
+      // In Melinda's index subfield separators are indexed as ' '
       .join(' ');
+      return titleString;
     }
-
     return false;
   }
-} // eslint-disable-next-line max-statements
+}
+function bibAuthors(record) {
+  const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:query:bibAuthors');
+  const debugData = debug.extend('data');
+  debug(`Creating query for the first author`);
+  //debugData(record);
+
+  const author = getAuthor(record);
+  const booleanStartWords = ['and', 'or', 'nor', 'not'];
+  if ((0, _matchingUtils.testStringOrNumber)(author)) {
+    const formatted = String(author).replace(/[^\w\s\p{Alphabetic}]/gu, '')
+    // Clean up concurrent spaces from fe. subfield changes
+    .replace(/ +/gu, ' ').trim().slice(0, 30).trim();
+
+    // use word search for authors starting with a boolean
+    const useWordSearch = booleanStartWords.some(word => formatted.toLowerCase().startsWith(word));
+    // Prevent too many matches by having a minimum length
+    debugData(`Author string: ${formatted}`);
+    if (formatted.length >= 5) {
+      return [`dc.author="${useWordSearch ? '' : '^'}${formatted}*"`];
+    }
+    //if (formatted) {
+    //  return [`dc.author="${formatted}"`];
+    //}
+    return [];
+  }
+  return [];
+  function getAuthor(record) {
+    //debugData(record);
+    // eslint-disable-next-line prefer-named-capture-group
+    const [field] = record.get(/^(100)|(110)|(111)|(700)|(710)|(711)$/u);
+    //debugData(field);
 
+    if (field) {
+      const authorString = field.subfields.filter(({
+        code
+      }) => ['a'].includes(code)).map(({
+        value
+      }) => (0, _matchingUtils.testStringOrNumber)(value) ? String(value) : '').filter(value => value)
+      // In Melinda's index subfield separators are indexed as ' '
+      .join(' ');
+      return authorString;
+    }
+    return false;
+  }
+}
+function bibPublishers(record) {
+  const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:query:bibPublishers');
+  const debugData = debug.extend('data');
+  debug(`Creating query for the first publisher`);
+  //debugData(record);
+
+  const publisher = getPublisher(record);
+  if ((0, _matchingUtils.testStringOrNumber)(publisher)) {
+    const formatted = String(publisher).replace(/[^\w\s\p{Alphabetic}]/gu, '')
+    // Clean up concurrent spaces from fe. subfield changes
+    .replace(/ +/gu, ' ').trim().slice(0, 30).trim();
+    debugData(`Publisher string: ${formatted}`);
+    // use non-wildcard word search from dc.publisher
+    return [`dc.publisher="${formatted}"`];
+  }
+  return [];
+  function getPublisher(record) {
+    //debugData(record);
+    const [field] = record.get(/^(?:260)|(?:264)$/u);
+    //debugData(field);
 
+    if (field) {
+      const publisherString = field.subfields.filter(({
+        code
+      }) => ['b'].includes(code)).map(({
+        value
+      }) => (0, _matchingUtils.testStringOrNumber)(value) ? String(value) : '').filter(value => value)
+      // In Melinda's index subfield separators are indexed as ' '
+      .join(' ');
+      return publisherString;
+    }
+    return false;
+  }
+}
 function bibStandardIdentifiers(record) {
   const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:query:bibStandardIdentifiers');
   const debugData = debug.extend('data');
   debug(`Creating queries for standard identifiers`);
+
+  // DEVELOP: should we query also f015 and f028?
+
   const fields = record.get(/^(?<def>020|022|024)$/u);
   const identifiers = [].concat(...fields.map(toIdentifiers));
   const uniqueIdentifiers = [...new Set(identifiers)];
   debugData(`Standard identifier fields: ${JSON.stringify(fields)}`);
   debugData(`Identifiers (${identifiers.length}): ${JSON.stringify(identifiers)}`);
   debugData(`Unique identifiers (${uniqueIdentifiers.length}): ${JSON.stringify(uniqueIdentifiers)}`);
-
   if (uniqueIdentifiers.length < 1) {
     debug(`No identifiers found, no queries created.`);
     return [];
   }
-
   return (0, _candidateSearchUtils.toQueries)(uniqueIdentifiers, 'dc.identifier');
-
   function toIdentifiers({
     tag,
     subfields
   }) {
     const issnIsbnReqExp = /^[A-Za-z0-9-]+$/u;
     const otherIdReqExp = /^[A-Za-z0-9-:]+$/u;
-
     if (tag === '022') {
-      return subfields.filter(sub => ['a', 'z', 'y'].includes(sub.code) && issnIsbnReqExp.test(sub.value) && sub.value !== undefined).map(({
+      return subfields.filter(sub => ['a', 'z', 'y'].includes(sub.code) && (0, _matchingUtils.testStringOrNumber)(sub.value) && issnIsbnReqExp.test(String(sub.value))).map(({
         value
-      }) => value);
+      }) => String(value));
     }
-
     if (tag === '020') {
-      return subfields.filter(sub => ['a', 'z'].includes(sub.code) && issnIsbnReqExp.test(sub.value) && sub.value !== undefined).map(({
+      return subfields.filter(sub => ['a', 'z'].includes(sub.code) && (0, _matchingUtils.testStringOrNumber)(sub.value) && issnIsbnReqExp.test(String(sub.value))).map(({
         value
-      }) => value);
+      }) => String(value));
     }
-
-    return subfields.filter(sub => ['a', 'z'].includes(sub.code) && otherIdReqExp.test(sub.value) && sub.value !== undefined).map(({
+    return subfields.filter(sub => ['a', 'z'].includes(sub.code) && (0, _matchingUtils.testStringOrNumber)(sub.value) && otherIdReqExp.test(String(sub.value))).map(({
       value
-    }) => value);
+    }) => String(value));
   }
 }
 //# sourceMappingURL=bib.js.map