Fixed bug where exceptions were not being checked when typing in a live qso sometimes

pull/425/head
Peter Goodhall 2019-08-16 18:21:11 +01:00
rodzic 0739790943
commit 6cc0dea243
2 zmienionych plików z 34 dodań i 17 usunięć

Wyświetl plik

@ -8,6 +8,10 @@ Website: [http://www.cloudlog.co.uk](http://www.cloudlog.co.uk)
* PHP (Version 7 or higher is recommended) & MySQL
You will also needthe following PHP modules installed
php-curl, php-mbstrings, php-xml
## Versions
* Master - Current working copy

Wyświetl plik

@ -1215,6 +1215,18 @@ class Logbook_model extends CI_Model {
public function dxcc_lookup($call, $date){
$len = strlen($call);
$this->db->where('call', $call);
$this->db->where('CURDATE() between start and end');
$query = $this->db->get('dxcc_exceptions');
if ($query->num_rows() > 0){
$row = $query->row_array();
return $row;
} else {
// query the table, removing a character from the right until a match
for ($i = $len; $i > 0; $i--){
//printf("searching for %s\n", substr($call, 0, $i));
@ -1236,6 +1248,7 @@ class Logbook_model extends CI_Model {
return $row;
}
}
}
return array("Not Found", "Not Found");
}