From d507ce1eca9cd5ab7cf6e8c498555bc01b61ffb4 Mon Sep 17 00:00:00 2001 From: csharpen Date: Thu, 8 Sep 2022 06:28:46 +0000 Subject: [PATCH 1/3] Trim leading and trailing whitespace in adifField parsing used by sendACLogMessage (issue #156) --- package.nw/lib/adif.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index 3547a91a..19616580 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -2864,7 +2864,7 @@ function aclAction(action) function adifField(record, key) { - if (key in record) return record[key]; + if (key in record) return record[key].trim(); else return ""; } function sendACLogMessage(record, port, address) From b24761ed29c40c1eb21f6852a2ac491cef98485b Mon Sep 17 00:00:00 2001 From: csharpen Date: Thu, 8 Sep 2022 16:08:23 -0500 Subject: [PATCH 2/3] More N3FJP county parsing --- package.nw/lib/adif.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index 19616580..9dba6055 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -2938,7 +2938,10 @@ function sendACLogMessage(record, port, address) ); report += aclUpdateControlValue("TXTENTRYITUZ", adifField(record, "ITUZ")); report += aclUpdateControlValue("TXTENTRYCQZONE", adifField(record, "CQZ")); - report += aclUpdateControlValue("TXTENTRYCOUNTYR", adifField(record, "CNTY")); + report += aclUpdateControlValue( + "TXTENTRYCOUNTYR", + adifField(record, "CNTY").replaceAll(", ", ",") + ); var sentSpcNum = false; if (adifField(record, "SRX").length > 0) From 0d8a7260cd6f0b9885101ace8c4ef8f8ec4e4139 Mon Sep 17 00:00:00 2001 From: csharpen Date: Fri, 9 Sep 2022 01:53:23 +0000 Subject: [PATCH 3/3] Update adif.js - whitespace woes --- package.nw/lib/adif.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index 9dba6055..b4d1062a 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -2939,7 +2939,7 @@ function sendACLogMessage(record, port, address) report += aclUpdateControlValue("TXTENTRYITUZ", adifField(record, "ITUZ")); report += aclUpdateControlValue("TXTENTRYCQZONE", adifField(record, "CQZ")); report += aclUpdateControlValue( - "TXTENTRYCOUNTYR", + "TXTENTRYCOUNTYR", adifField(record, "CNTY").replaceAll(", ", ",") );