[DXCC identification] Fix for 2x1 KG4 call
这个提交包含在:
父节点
41a72d3f51
当前提交
4d129170de
共有 1 个文件被更改,包括 12 次插入 和 5 次删除
|
|
@ -2818,9 +2818,12 @@ class Logbook_model extends CI_Model {
|
||||||
$row = $dxcc_exceptions->row_array();
|
$row = $dxcc_exceptions->row_array();
|
||||||
return array($row['adif'], $row['entity'], $row['cqz']);
|
return array($row['adif'], $row['entity'], $row['cqz']);
|
||||||
}
|
}
|
||||||
|
if (preg_match('/(^KG4)[A-Z09]{3}/', $call)) { // KG4/ and KG4 5 char calls are Guantanamo Bay. If 4 or 6 char, it is USA
|
||||||
if (preg_match('/(^KG4)[A-Z09]{3,}/', $call)) { // KG4/ and KG4 5 char calls are Guantanamo Bay. If 6 char, it is USA
|
$call = "K";
|
||||||
$call = "K";
|
} elseif (preg_match('/(^KG4)[A-Z09]{2}/', $call)) {
|
||||||
|
$call = "KG4";
|
||||||
|
} elseif (preg_match('/(^KG4)[A-Z09]{1}/', $call)) {
|
||||||
|
$call = "K";
|
||||||
} elseif (preg_match_all('/^((\d|[A-Z])+\/)?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?$/', $call, $matches)) {
|
} elseif (preg_match_all('/^((\d|[A-Z])+\/)?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?$/', $call, $matches)) {
|
||||||
if ($matches[5][0] == '/MM') {
|
if ($matches[5][0] == '/MM') {
|
||||||
$row['adif'] = 0;
|
$row['adif'] = 0;
|
||||||
|
|
@ -2871,8 +2874,12 @@ class Logbook_model extends CI_Model {
|
||||||
return $row;
|
return $row;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (preg_match('/(^KG4)[A-Z09]{3,}/', $call)) { // KG4/ and KG4 5 char calls are Guantanamo Bay. If 6 char, it is USA
|
if (preg_match('/(^KG4)[A-Z09]{3}/', $call)) { // KG4/ and KG4 5 char calls are Guantanamo Bay. If 4 or 6 char, it is USA
|
||||||
$call = "K";
|
$call = "K";
|
||||||
|
} elseif (preg_match('/(^KG4)[A-Z09]{2}/', $call)) {
|
||||||
|
$call = "KG4";
|
||||||
|
} elseif (preg_match('/(^KG4)[A-Z09]{1}/', $call)) {
|
||||||
|
$call = "K";
|
||||||
} elseif (preg_match_all('/^((\d|[A-Z])+\/)?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?$/', $call, $matches)) {
|
} elseif (preg_match_all('/^((\d|[A-Z])+\/)?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?$/', $call, $matches)) {
|
||||||
if ($matches[5][0] == '/MM') {
|
if ($matches[5][0] == '/MM') {
|
||||||
$row['adif'] = 0;
|
$row['adif'] = 0;
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用