diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 56bc6be9..b585d7c8 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2834,13 +2834,23 @@ class Logbook_model extends CI_Model { } 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)) { - if ($matches[5][0] == '/MM') { + if ($matches[5][0] == '/MM' || $matches[5][0] == '/AM') { $row['adif'] = 0; $row['entity'] = 'None'; $row['cqz'] = 0; return array($row['adif'], $row['entity'], $row['cqz']); - } - } + } else { + $result = $this->wpx($call, 1); # use the wpx prefix instead + if ($result == '') { + $row['adif'] = 0; + $row['entity'] = 'None'; + $row['cqz'] = 0; + return array($row['adif'], $row['entity'], $row['cqz']); + } else { + $call = $result . "AA"; + } + } + } $len = strlen($call); @@ -2890,15 +2900,27 @@ class Logbook_model extends CI_Model { } 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)) { - if ($matches[5][0] == '/MM') { + if ($matches[5][0] == '/MM' || $matches[5][0] == '/AM') { $row['adif'] = 0; $row['entity'] = 'None'; $row['cqz'] = 0; $row['long'] = '0'; $row['lat'] = '0'; return $row; - } - } + } else { + $result = $this->wpx($call, 1); # use the wpx prefix instead + if ($result == '') { + $row['adif'] = 0; + $row['entity'] = 'None'; + $row['cqz'] = 0; + $row['long'] = '0'; + $row['lat'] = '0'; + return $row; + } else { + $call = $result . "AA"; + } + } + } $len = strlen($call); @@ -2906,12 +2928,12 @@ class Logbook_model extends CI_Model { for ($i = $len; $i > 0; $i--){ //printf("searching for %s\n", substr($call, 0, $i)); $dxcc_result = $this->db->select('*') - ->where('call', substr($call, 0, $i)) - ->where('(start <= ', $date) - ->or_where("start is null)", NULL, false) - ->where('(end >= ', $date) - ->or_where("end is null)", NULL, false) - ->get('dxcc_prefixes'); + ->where('call', substr($call, 0, $i)) + ->where('(start <= ', $date) + ->or_where("start is null)", NULL, false) + ->where('(end >= ', $date) + ->or_where("end is null)", NULL, false) + ->get('dxcc_prefixes'); //$dxcc_result = $this->db->query("select `call`, `entity`, `adif` from dxcc_prefixes where `call` = '".substr($call, 0, $i) ."'"); //print $this->db->last_query(); @@ -2926,6 +2948,137 @@ class Logbook_model extends CI_Model { return array("Not Found", "Not Found"); } + function wpx($testcall, $i) { + $prefix = ''; + $a = ''; + $b = ''; + $c = ''; + + $lidadditions = '/^QRP|^LGT/'; + $csadditions = '/^P$|^M{1,2}$|^AM$|^A$/'; + + # First check if the call is in the proper format, A/B/C where A and C + # are optional (prefix of guest country and P, MM, AM etc) and B is the + # callsign. Only letters, figures and "/" is accepted, no further check if the + # callsign "makes sense". + # 23.Apr.06: Added another "/X" to the regex, for calls like RV0AL/0/P + # as used by RDA-DXpeditions.... + + if (preg_match_all('/^((\d|[A-Z])+\/)?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?$/', $testcall, $matches)) { + + # Now $1 holds A (incl /), $3 holds the callsign B and $5 has C + # We save them to $a, $b and $c respectively to ensure they won't get + # lost in further Regex evaluations. + $a = $matches[1][0]; + $b = $matches[3][0]; + $c = $matches[5][0]; + + if ($a) { + $a = substr($a, 0, -1); # Remove the / at the end + } + if ($c) { + $c = substr($c, 1,); # Remove the / at the beginning + }; + + # In some cases when there is no part A but B and C, and C is longer than 2 + # letters, it happens that $a and $b get the values that $b and $c should + # have. This often happens with liddish callsign-additions like /QRP and + # /LGT, but also with calls like DJ1YFK/KP5. ~/.yfklog has a line called + # "lidadditions", which has QRP and LGT as defaults. This sorts out half of + # the problem, but not calls like DJ1YFK/KH5. This is tested in a second + # try: $a looks like a call (.\d[A-Z]) and $b doesn't (.\d), they are + # swapped. This still does not properly handle calls like DJ1YFK/KH7K where + # only the OP's experience says that it's DJ1YFK on KH7K. + if (!$c && $a && $b) { # $a and $b exist, no $c + if (preg_match($lidadditions, $b)) { # check if $b is a lid-addition + $b = $a; + $a = null; # $a goes to $b, delete lid-add + } elseif ((preg_match('/\d[A-Z]+$/', $a)) && (preg_match('/\d$/', $b))) { # check for call in $a + $temp = $b; + $b = $a; + $a = $temp; + } + } + + # *** Added later *** The check didn't make sure that the callsign + # contains a letter. there are letter-only callsigns like RAEM, but not + # figure-only calls. + + if (preg_match('/^[0-9]+$/', $b)) { # Callsign only consists of numbers. Bad! + return null; # exit, undef + } + + # Depending on these values we have to determine the prefix. + # Following cases are possible: + # + # 1. $a and $c undef --> only callsign, subcases + # 1.1 $b contains a number -> everything from start to number + # 1.2 $b contains no number -> first two letters plus 0 + # 2. $a undef, subcases: + # 2.1 $c is only a number -> $a with changed number + # 2.2 $c is /P,/M,/MM,/AM -> 1. + # 2.3 $c is something else and will be interpreted as a Prefix + # 3. $a is defined, will be taken as PFX, regardless of $c + + if (($a == null) && ($c == null)) { # Case 1 + if (preg_match('/\d/', $b)) { # Case 1.1, contains number + preg_match('/(.+\d)[A-Z]*/', $b, $matches); # Prefix is all but the last + $prefix = $matches[1]; # Letters + } else { # Case 1.2, no number + $prefix = substr($b, 0, 2) . "0"; # first two + 0 + } + } elseif (($a == null) && (isset($c))) { # Case 2, CALL/X + if (preg_match('/^(\d)$/', $c)) { # Case 2.1, number + preg_match('/(.+\d)[A-Z]*/', $b, $matches); # regular Prefix in $1 + # Here we need to find out how many digits there are in the + # prefix, because for example A45XR/0 is A40. If there are 2 + # numbers, the first is not deleted. If course in exotic cases + # like N66A/7 -> N7 this brings the wrong result of N67, but I + # 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 + $prefix = $matches[1] . $c; # -> A40 + } else { # Otherwise cut all numbers + preg_match('/(.*[A-Z])\d+/', $matches[1], $match); # Prefix w/o number in $1 + $prefix = $match[1] . $c; # Add attached number + } + } elseif (preg_match($csadditions, $c)) { + preg_match('/(.+\d)[A-Z]*/', $b, $matches); # Known attachment -> like Case 1.1 + $prefix = $matches[1]; + } elseif (preg_match('/^\d\d+$/', $c)) { # more than 2 numbers -> ignore + preg_match('/(.+\d)[A-Z]* /', $b, $matches); # see above + $prefix = $matches[1][0]; + } else { # Must be a Prefix! + if (preg_match('/\d$/', $c)) { # ends in number -> good prefix + $prefix = $c; + } else { # Add Zero at the end + $prefix = $c . "0"; + } + } + } elseif ($a) { + # $a contains the prefix we want + if (preg_match('/\d$/', $a)) { # ends in number -> good prefix + $prefix = $a; + } else { # add zero if no number + $prefix = $a . "0"; + } + } + # In very rare cases (right now I can only think of KH5K and KH7K and FRxG/T + # etc), the prefix is wrong, for example KH5K/DJ1YFK would be KH5K0. In this + # case, the superfluous part will be cropped. Since this, however, changes the + # DXCC of the prefix, this will NOT happen when invoked from with an + # extra parameter $_[1]; this will happen when invoking it from &dxcc. + + if (preg_match('/(\w+\d)[A-Z]+\d/', $prefix, $matches) && $i == null) { + $prefix = $matches[1][0]; + } + return $prefix; + } else { + return ''; + } + } + public function get_entity($dxcc){ $sql = "select name, cqz, lat, 'long' from dxcc_entities where adif = " . $dxcc; $query = $this->db->query($sql);