From 6be1991a906e73e80d6eef6e089ea67d4d9ca7c4 Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 23 Jan 2025 09:59:25 +0000 Subject: [PATCH] Added exception for /B Suffix at Call (shouldn't resolve to china) --- application/models/Logbook_model.php | 6 +++--- src/Dxcc/Dxcc.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 68f0cb35c..770e1f12c 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4718,7 +4718,7 @@ class Logbook_model extends CI_Model { */ public function check_dxcc_table($call, $date) { - $csadditions = '/^X$|^D$|^T$|^P$|^R$|^A$|^M$/'; + $csadditions = '/^X$|^D$|^T$|^P$|^R$|^B$|^A$|^M$/'; $dxcc_exceptions = $this->db->select('`entity`, `adif`, `cqz`, `cont`') ->where('`call`', $call) @@ -4809,7 +4809,7 @@ class Logbook_model extends CI_Model { public function dxcc_lookup($call, $date) { - $csadditions = '/^X$|^D$|^T$|^P$|^R$|^A$|^M$|^LH$/'; + $csadditions = '/^X$|^D$|^T$|^P$|^R$|^B$|^A$|^M$|^LH$/'; $dxcc_exceptions = $this->db->select('`entity`, `adif`, `cqz`,`cont`') ->where('`call`', $call) @@ -4918,7 +4918,7 @@ class Logbook_model extends CI_Model { $c = ''; $lidadditions = '/^QRP$|^LGT$/'; - $csadditions = '/^X$|^D$|^T$|^P$|^R$|^A$|^M$|^LH$/'; + $csadditions = '/^X$|^D$|^T$|^P$|^R$|^B$|^A$|^M$|^LH$/'; $noneadditions = '/^MM$|^AM$/'; # First check if the call is in the proper format, A/B/C where A and C diff --git a/src/Dxcc/Dxcc.php b/src/Dxcc/Dxcc.php index 965ccc599..778fa5dfa 100644 --- a/src/Dxcc/Dxcc.php +++ b/src/Dxcc/Dxcc.php @@ -13,7 +13,7 @@ class Dxcc { public function dxcc_lookup($call, $date) { - $csadditions = '/^P$|^R$|^A$|^M$/'; + $csadditions = '/^P$|^R$|^A$|^B$|^M$/'; $CI =& get_instance(); if (array_key_exists($call, $this->dxccexceptions)) { @@ -91,7 +91,7 @@ class Dxcc { $c = ''; $lidadditions = '/^QRP$|^LGT$/'; - $csadditions = '/^P$|^R$|^A$|^M$|^LH$/'; + $csadditions = '/^P$|^R$|^B$|^A$|^M$|^LH$/'; $noneadditions = '/^MM$|^AM$/'; # First check if the call is in the proper format, A/B/C where A and C