diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 68379119..2aa640f0 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -72,6 +72,7 @@ class Logbook extends CI_Controller { "callsign_qth" => "", "callsign_iota" => "", "callsign_state" => "", + "callsign_us_county" => "", "qsl_manager" => "", "bearing" => "", "workedBefore" => false, @@ -141,6 +142,7 @@ class Logbook extends CI_Controller { $return['callsign_qth'] = $callbook['city']; $return['callsign_iota'] = $callbook['iota']; $return['callsign_state'] = $callbook['state']; + $return['callsign_us_county'] = $callbook['us_county']; if(isset($callbook['qslmgr'])) { $return['qsl_manager'] = $callbook['qslmgr']; diff --git a/application/libraries/Hamqth.php b/application/libraries/Hamqth.php index b98bb79f..69b49aad 100644 --- a/application/libraries/Hamqth.php +++ b/application/libraries/Hamqth.php @@ -79,8 +79,18 @@ class Hamqth { $data['lat'] = (string) $xml->search->latitude; $data['long'] = (string) $xml->search->longitude; $data['iota'] = (string) $xml->search->iota; + $data['us_state'] = (string) $xml->search->us_state; + $data['us_county'] = (string) $xml->search->us_county; $data['error'] = (string) $xml->session->error; + if($xml->search->country == "United States") { + $data['state'] = (string) $xml->search->us_state; + $data['us_county'] = (string) $xml->search->us_county; + } else { + $data['state'] = null; + $data['us_county'] = null; + } + return $data; } } diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php index de0e1805..dd0c995d 100755 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -83,8 +83,10 @@ class Qrz { if($xml->Callsign->country == "United States") { $data['state'] = (string) $xml->Callsign->state; + $data['us_county'] = (string) $xml->Callsign->county; } else { $data['state'] = null; + $data['us_county'] = null; }