Merge pull request #969 from AndreasK79/import_speedup
[ADIF Import] Reworking the logic for fetching the QRZ API Key, skips…
这个提交包含在:
当前提交
e3ba7411aa
共有 1 个文件被更改,包括 17 次插入 和 13 次删除
|
|
@ -380,10 +380,13 @@ class Logbook_model extends CI_Model {
|
||||||
|
|
||||||
$last_id = $this->db->insert_id();
|
$last_id = $this->db->insert_id();
|
||||||
|
|
||||||
|
// No point in fetching qrz api key and qrzrealtime setting if we're skipping the export
|
||||||
|
if (!$skipexport) {
|
||||||
|
|
||||||
$result = $this->exists_qrz_api_key($data['station_id']);
|
$result = $this->exists_qrz_api_key($data['station_id']);
|
||||||
|
|
||||||
// Push qso to qrz if apikey is set, and realtime upload is enabled, and we're not importing an adif-file
|
// Push qso to qrz if apikey is set, and realtime upload is enabled, and we're not importing an adif-file
|
||||||
if (isset($result->qrzapikey) && $result->qrzrealtime == 1 && !$skipexport) {
|
if (isset($result->qrzapikey) && $result->qrzrealtime == 1) {
|
||||||
$CI =& get_instance();
|
$CI =& get_instance();
|
||||||
$CI->load->library('AdifHelper');
|
$CI->load->library('AdifHelper');
|
||||||
$qso = $this->get_qso($last_id)->result();
|
$qso = $this->get_qso($last_id)->result();
|
||||||
|
|
@ -395,6 +398,7 @@ class Logbook_model extends CI_Model {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Function checks if a QRZ API Key exists in the table with the given station id
|
* Function checks if a QRZ API Key exists in the table with the given station id
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用