Pair http and https

package.json

@@ -14,7 +14,7 @@
 		"url": "[email protected]:natlibfi/melinda-marc-record-merge-reducers-js.git"
 	},
 	"license": "LGPL-3.0+",
-	"version": "2.0.19-alpha.2",
+	"version": "2.0.19-alpha.3",
 	"main": "./dist/index.js",
 	"engines": {
 		"node": ">=18"

src/reducers/counterpartField.js

@@ -57,7 +57,7 @@ function counterpartExtraNormalize(tag, subfieldCode, value) {
   // Mainly for field 260$c:
   value = removeCopyright(value);
 
-
+  value = value.replace(/http:\/\//ug, 'https://'); // MET-501: http vs https
   value = normalizeForSamenessCheck(tag, subfieldCode, value);
 
   /* eslint-enable */

src/reducers/mergeConstraints.js

@@ -256,7 +256,7 @@ const mergeConstraints = [
   {'tag': '853', 'required': 'a'},
   {'tag': '854', 'required': 'a'},
   {'tag': '855', 'required': 'a'},
-  {'tag': '856', 'required': 'u', 'paired': 'auw3', 'key': 'abqusv'},
+  {'tag': '856', 'required': 'u', 'paired': 'u', 'key': 'opuw23'}, // 856 is built around $u...
   {'tag': '863', 'required': 'a'},
   {'tag': '864', 'required': 'a'},
   {'tag': '865', 'required': 'a'},

src/reducers/mergeSubfield.js

@@ -130,6 +130,16 @@ function coverTypesMatch(candSubfield, relevantSubfields) {
   return false;
 }
 
+function httpToHttps(val) {
+  return val.replace(/http:\/\//ug, 'https://');
+}
+
+function pairHttpAndHttps(candSubfield, relevantSubfields) {
+  const a = httpToHttps(candSubfield.value);
+  const bs = relevantSubfields.map(sf => httpToHttps(sf.value));
+  return bs.includes(a);
+}
+
 function isSynonym(field, candSubfield, relevantSubfields) {
   if (candSubfield.code === 'q' && ['015', '020', '024', '028'].includes(field.tag)) {
     return coverTypesMatch(candSubfield, relevantSubfields);
@@ -138,6 +148,9 @@ function isSynonym(field, candSubfield, relevantSubfields) {
   if (candSubfield.code === 'i') {
     return relationInformationMatches(candSubfield, relevantSubfields);
   }
+  if (pairHttpAndHttps(candSubfield, relevantSubfields)) {
+    return true;
+  }
 
   return false;
 }
@@ -161,6 +174,22 @@ function preferHyphenatedISBN(field, candSubfield, relevantSubfields) {
   return true;
 }
 
+function preferHttpsOverHttp(candSubfield, relevantSubfields) {
+  if (candSubfield.value.substring(0, 8) !== 'https://') {
+    return false;
+  }
+
+  const httpVersion = `http://${candSubfield.value.substring(8)}`;
+  const pair = relevantSubfields.find(sf => sf.value === httpVersion);
+
+  if (!pair) {
+    return false;
+  }
+  pair.value = candSubfield.value; // eslint-disable-line functional/immutable-data
+  return true;
+}
+
+
 export function mergeSubfield(targetField, candSubfield) {
   // Replace existing subfield with the incoming field. These replacements are by name rather hacky...
   // Currenty we only select the better X00$d.
@@ -183,8 +212,9 @@ export function mergeSubfield(targetField, candSubfield) {
 
 
   if (replaceDatesAssociatedWithName(targetField, candSubfield, relevantSubfields) ||
-      isSynonym(targetField, candSubfield, relevantSubfields) ||
-      preferHyphenatedISBN(targetField, candSubfield, relevantSubfields)) {
+      preferHyphenatedISBN(targetField, candSubfield, relevantSubfields) ||
+      preferHttpsOverHttp(candSubfield, relevantSubfields) ||
+      isSynonym(targetField, candSubfield, relevantSubfields)) {
     return true;
   }
 

src/reducers/preprocessPrepublication.js

@@ -44,10 +44,10 @@ const debugDev = debug.extend('dev');
 //const NA = 4; // Non-Applicable; used by Fennica-specific encoding level only
 
 export default () => (base, source) => {
-  nvdebug('BASE', debugDev);
-  nvdebug(JSON.stringify(base), debugDev);
-  nvdebug('SOURCE', debugDev);
-  nvdebug(JSON.stringify(source), debugDev);
+  //nvdebug('BASE', debugDev);
+  //nvdebug(JSON.stringify(base), debugDev);
+  //nvdebug('SOURCE', debugDev);
+  //nvdebug(JSON.stringify(source), debugDev);
 
 
   handlePrepublicationNameEntries(base, source);

test-fixtures/reducers/index/856u_http_vs_https/base.json

@@ -0,0 +1,15 @@
+{
+  "leader": "01331cam a22003494i 4500",
+  "fields": [
+    { "tag": "001", "value": "12345"},
+
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "http://urn.fi/polku/123" },
+      { "code": "q", "value": "Wanha"}
+    ] },
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "https://urn.fi/polku/321" },
+      { "code": "q", "value": "Wanha 2"}
+    ] }
+  ]
+}

test-fixtures/reducers/index/856u_http_vs_https/merged.json

@@ -0,0 +1,20 @@
+{
+  "leader": "01331cam a22003494i 4500",
+  "fields": [
+    { "tag": "001", "value": "12345"},
+
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "https://urn.fi/polku/123" },
+      { "code": "q", "value": "Wanha"}
+    ] },
+
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "https://urn.fi/polku/321" },
+      { "code": "q", "value": "Wanha 2"}
+    ] },
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "http://urn.fi/polku/432" },
+      { "code": "q", "value": "Uusi 3" }
+    ] }
+  ]
+}

test-fixtures/reducers/index/856u_http_vs_https/metadata.json

@@ -0,0 +1,5 @@
+{
+  "description":"MET-501: pairability of http vs https",
+  "skip": false,
+  "only": false
+}

test-fixtures/reducers/index/856u_http_vs_https/modifiedSource.json

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

test-fixtures/reducers/index/856u_http_vs_https/source.json

@@ -0,0 +1,20 @@
+{
+  "leader": "01331cam a22003494i 4500",
+  "fields": [
+    { "tag": "001", "value": "123456"},
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "https://urn.fi/polku/123" }
+    ] },
+
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "http://urn.fi/polku/321" },
+      { "code": "q", "value": "Uusi 2" }
+    ] },
+
+    { "tag": "856", "ind1": "4", "ind2": "0", "subfields": [
+      { "code": "u", "value": "http://urn.fi/polku/432" },
+      { "code": "q", "value": "Uusi 3" }
+    ] }
+
+  ]
+}