goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #2043 from hugosilvaparagramanet/feature/improve-mark-as-upload-process-for-qo100-dx-club-export

浏览代码 
Mark QSOs as uploaded in batch to improve performance
这个提交包含在：
Peter Goodhall 2023-03-21 15:21:58 +00:00 提交者 GitHub
当前提交 d675941d1e
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 21 次插入 和 12 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

11
application/controllers/Webadif.php
查看文件

@ -61,7 +61,7 @@ class Webadif extends CI_Controller {
$result = $this->logbook_model->push_qso_to_webadif($webadif_api_url, $webadif_api_key, $adif); $result = $this->logbook_model->push_qso_to_webadif($webadif_api_url, $webadif_api_key, $adif);
if ($result) { if ($result) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY); $this->logbook_model->mark_webadif_qsos_sent([$qso->COL_PRIMARY_KEY]);
$i++; $i++;
} else { } else {
$errorMessage = 'QO-100 Dx Club upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errorMessage = 'QO-100 Dx Club upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
@ -149,8 +149,15 @@ class Webadif extends CI_Controller {
); );
if ($data['qsos']!==null) { if ($data['qsos']!==null) {
$qsoIDs=[];
foreach ($data['qsos']->result() as $qso) { foreach ($data['qsos']->result() as $qso) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY); $qsoIDs[]=$qso->COL_PRIMARY_KEY;
}
$batchSize = 500;
while ($qsoIDs !== []) {
$slice = array_slice($qsoIDs, 0, $batchSize);
$qsoIDs = array_slice($qsoIDs, $batchSize);
$this->logbook_model->mark_webadif_qsos_sent($slice);
} }
} }

22
application/models/Logbook_model.php
查看文件

@ -497,7 +497,7 @@ class Logbook_model extends CI_Model {
); );
if ($result) { if ($result) {
$this->mark_webadif_qsos_sent($last_id); $this->mark_webadif_qsos_sent([$last_id]);
} }
} }
} }
@ -632,17 +632,19 @@ class Logbook_model extends CI_Model {
/* /*
* Function marks QSOs as uploaded to WebADIF. * Function marks QSOs as uploaded to WebADIF.
* $primarykey is the unique id for that QSO in the logbook * $qsoIDs is an arroy of unique id for the QSOs in the logbook
*/ */
function mark_webadif_qsos_sent($primarykey) function mark_webadif_qsos_sent(array $qsoIDs)
{ {
$data = array( $data = [];
'upload_date' => date("Y-m-d H:i:s", strtotime("now")), $now = date("Y-m-d H:i:s", strtotime("now"));
'qso_id' => $primarykey, foreach ($qsoIDs as $qsoID) {
); $data[] = [
'upload_date' => $now,
$this->db->insert('webadif', $data); 'qso_id' => $qsoID,
];
}
$this->db->insert_batch('webadif', $data);
return true; return true;
} }