@natlibfi/marc-record-merge 6.0.0-beta.5 → 6.0.0-beta.8

package/src/reducers/select.js

@@ -1,20 +1,23 @@
 import {normalizeSync} from 'normalize-diacritics';
 import createDebugLogger from 'debug';
+import {MarcRecord} from '@natlibfi/marc-record';
 
 export function strictEquality(subfieldA, subfieldB) {
   return subfieldA.code === subfieldB.code &&
-  subfieldA.value === subfieldB.value;
+    subfieldA.value === subfieldB.value;
 }
 
 export function subsetEquality(subfieldA, subfieldB) {
   return subfieldA.code === subfieldB.code &&
-  (subfieldA.value.indexOf(subfieldB.value) !== -1 || subfieldB.value.indexOf(subfieldA.value) !== -1);
+    (subfieldA.value.indexOf(subfieldB.value) !== -1 || subfieldB.value.indexOf(subfieldA.value) !== -1);
 }
 // EqualityFunction can be either strictEquality or subsetEquality
 export default ({tagPattern, equalityFunction = strictEquality}) => (base, source) => {
   const debug = createDebugLogger('@natlibfi/marc-record-merge:select');
-  const baseFields = base.get(tagPattern);
-  const sourceFields = source.get(tagPattern);
+  const baseRecord = new MarcRecord(base, {subfieldValues: false});
+  const sourceRecord = new MarcRecord(source, {subfieldValues: false});
+  const baseFields = baseRecord.get(tagPattern);
+  const sourceFields = sourceRecord.get(tagPattern);
   const fieldTag = sourceFields.map(field => field.tag);
   debug(`Comparing field ${fieldTag}`);
 

package/src/reducers/select.spec.js

@@ -28,8 +28,12 @@ function callback({
     console.log('TEST DISABLED!'); // eslint-disable-line no-console
     return;
   }
-  const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
-  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
+  //  const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
+  //  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
+
+  const base = getFixture('base.json');
+  const source = getFixture('source.json');
+
   const tagPattern = new RegExp(tagPatternRegExp, 'u');
   const expectedRecord = getFixture('merged.json');
   const equalityFunction = useSubsetEquality ? subsetEquality : undefined;
@@ -41,5 +45,5 @@ function callback({
   }
 
   const mergedRecord = createReducer({tagPattern, equalityFunction})(base, source);
-  expect(mergedRecord.toObject()).to.eql(expectedRecord);
+  expect(mergedRecord).to.eql(expectedRecord);
 }

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/01/base.json

@@ -0,0 +1,17 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "100",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {"code": "a", "value": "test"}
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/01/merged.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "100",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                "code": "a",
+                "value": "test"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/01/metadata.json

@@ -0,0 +1,6 @@
+{
+    "description": "Copy field 010 if f100 not present: f100 present",
+    "tagPatternRegExp": "^010$",
+    "doNotCopyIfFieldPresent": "^100$",
+    "only": false
+}

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/01/source.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                    "code": "a",
+                    "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/02/merged.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                "code": "a",
+                "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/02/metadata.json

@@ -0,0 +1,6 @@
+{
+    "description": "Copy field 010 if f100 not present: f100 not present",
+    "tagPatternRegExp": "^010$",
+    "doNotCopyIfFieldPresent": "^100$",
+    "only": false
+}

package/test-fixtures/reducers/copy/02 - doNotCopyIfFieldPresent/02/source.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                    "code": "a",
+                    "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/05 - copyUnless/01/base.json

@@ -0,0 +1,9 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/01/base.json

@@ -0,0 +1,9 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/01/merged.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                "code": "b",
+                "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/01/metadata.json

@@ -0,0 +1,6 @@
+{
+    "description": "Swap subfield code from a to b if copied: swapped",
+    "tagPatternRegExp": "^010$",
+    "swapSubfieldCode": [{"from": "a", "to": "b"}],
+    "only": false
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/01/source.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                    "code": "a",
+                    "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/02/base.json

@@ -0,0 +1,9 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/02/merged.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                "code": "c",
+                "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/02/metadata.json

@@ -0,0 +1,6 @@
+{
+    "description": "Swap subfield code from a to b if copied: no 'a' found",
+    "tagPatternRegExp": "^010$",
+    "swapSubfieldCode": [{"from": "a", "to": "b"}],
+    "only": false
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/02/source.json

@@ -0,0 +1,20 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                    "code": "c",
+                    "value": "##2002021346"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/03/base.json

@@ -0,0 +1,9 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/03/merged.json

@@ -0,0 +1,31 @@
+{
+    "leader": "01331cam a22003494i 4500",
+    "fields": [
+        {
+            "tag": "001",
+            "value": "007346734"
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                "code": "b",
+                "value": "##2002021346"
+                }
+            ]
+        },
+        {
+            "tag": "010",
+            "ind1": " ",
+            "ind2": " ",
+            "subfields": [
+                {
+                "code": "b",
+                "value": "##2002021f46"
+                }
+            ]
+        }
+    ]
+}

package/test-fixtures/reducers/copy/09 - swapSubfieldCode/03/metadata.json

@@ -0,0 +1,6 @@
+{
+    "description": "Swap subfield code from a to b if copied: multiple 'a' swapped",
+    "tagPatternRegExp": "^010$",
+    "swapSubfieldCode": [{"from": "a", "to": "b"}],
+    "only": false
+}