Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for A45/0 callsigns

Browse Source
This commit is contained in:
Andreas Kristiansen
2026-01-25 17:15:36 +01:00
parent 8fa76d2ff1
commit 19675bae84
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/Calltester.php
View File

@@ -822,9 +822,16 @@ class Calltester extends CI_Controller {
'Date' => '1999-08-04'
);
$testarray[] = array(
'Callsign' => 'A6050Y/5',
'Country' => 'United Arab Emirates',
'Adif' => 391,
'Date' => $date = date('Y-m-d', time())
);
set_time_limit(3600);
// Starting clock time in seconds
$start_time = microtime(true);
$result = array();
@@ -835,6 +842,7 @@ class Calltester extends CI_Controller {
foreach ($testarray as $call) {
$i++;
$dxcc = $dxccobj->dxcc_lookup($call['Callsign'], $call['Date']);
$dxcc['adif'] = (isset($dxcc['adif'])) ? $dxcc['adif'] : 0;
@@ -1062,7 +1070,7 @@ class Calltester extends CI_Controller {
# think that's rather irrelevant cos such calls rarely appear
# and if they do, it's very unlikely for them to have a number
# attached. You can still edit it by hand anyway..
if (preg_match('/^([A-Z]\d)\d$/', $matches[1])) { # e.g. A45 $c = 0
if (preg_match('/^([A-Z]\d{2,})$/', $matches[1])) { # e.g. A45 $c = 0
$prefix = $matches[1] . $c; # -> A40
} else { # Otherwise cut all numbers
preg_match('/(.*[A-Z])\d+/', $matches[1], $match); # Prefix w/o number in $1

2
src/Dxcc/Dxcc.php
View File

@@ -269,7 +269,7 @@ class Dxcc {
]);
return '';
}
if (preg_match('/^([A-Z]\d)\d$/', $matches[1])) { # e.g. A45 $c = 0
if (preg_match('/^([A-Z]\d{2,})$/', $matches[1])) { # e.g. A45 $c = 0
$prefix = $matches[1] . $c; # -> A40
} else { # Otherwise cut all numbers
if (!preg_match('/(.*[A-Z])\d+/', $matches[1], $match)) {