mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Update ADIF import prodecure to find country and dxcc

pull/195/head
Andy 2016-02-28 17:43:45 +00:00
rodzic 35363f2374
commit 6bd219f1f2
1 zmienionych plików z 21 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

34
application/models/logbook_model.php
Wyświetl plik

@ -762,25 +762,30 @@ class Logbook_model extends CI_Model {
$gridsquare = "";
}
// DXCC id
$dxcc = $this->check_dxcc_table($record['call'], $time_off);
// Store or find country name
if(isset($record['country'])) {
$country = $record['country'];
} else {
$this->load->model('dxcc');
// $this->load->model('dxcc');
$dxccinfo = $this->dxcc->info($record['call']);
// $dxccinfo = $this->dxcc->info($record['call']);
if ($dxccinfo->num_rows() > 0)
{
foreach ($dxccinfo->result() as $row1)
{
$country = ucfirst(strtolower($row1->name));
}
} else {
$country = "";
}
// if ($dxccinfo->num_rows() > 0)
// {
// foreach ($dxccinfo->result() as $row1)
// {
// $country = ucfirst(strtolower($row1->name));
// }
// } else {
// $country = "";
// }
$country = ucwords(strtolower($dxcc[1]));
}
// Store QTH
if(isset($record['qth'])) {
$qth = $record['qth'];
@ -889,7 +894,6 @@ class Logbook_model extends CI_Model {
$mode = $record['mode'];
}
$this->db->where('COL_CALL', $record['call']);
$this->db->where('COL_TIME_ON', $time_on);
$check = $this->db->get($this->config->item('table_name'));
@ -927,7 +931,8 @@ class Logbook_model extends CI_Model {
'COL_QSLSDATE' => $QSLSDATE,
'COL_QSL_SENT' => $QSLSENT,
'COL_LOTW_QSL_SENT' => $LOTWQSLSENT,
'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD
'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD,
'COL_DXCC' => $dxcc[0],
);
// if eQSL username set, default SENT & RCVD to 'N' else leave as null
@ -941,6 +946,9 @@ class Logbook_model extends CI_Model {
}
/*
* Check the dxxc_prefixes table and return (dxcc, country)
*/
private function check_dxcc_table($call, $date){
$len = strlen($call);