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

Merge pull request #42 from int2001/hrdfix

浏览代码 
Set status if no QSO found in upload-loop
这个提交包含在：
HB9HIL 2023-12-16 13:35:21 +01:00 提交者 GitHub
当前提交 a4bc26d9b6
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改，包括 42 次插入 和 40 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

82
application/controllers/Hrdlog.php
查看文件

@ -50,50 +50,52 @@ class Hrdlog extends CI_Controller {
* Adif is build for each qso, and then uploaded, one at a time * Adif is build for each qso, and then uploaded, one at a time
*/ */
function mass_upload_qsos($station_id, $hrdlog_username, $hrdlog_code) { function mass_upload_qsos($station_id, $hrdlog_username, $hrdlog_code) {
$i = 0; $i = 0;
$data['qsos'] = $this->logbook_model->get_hrdlog_qsos($station_id); $data['qsos'] = $this->logbook_model->get_hrdlog_qsos($station_id);
$errormessages = array(); $errormessages = array();
$CI = &get_instance(); $this->load->library('AdifHelper');
$CI->load->library('AdifHelper');
if ($data['qsos']) { if ($data['qsos']) {
foreach ($data['qsos']->result() as $qso) { foreach ($data['qsos']->result() as $qso) {
$adif = $CI->adifhelper->getAdifLine($qso); $adif = $this->adifhelper->getAdifLine($qso);
if ($qso->COL_HRDLOG_QSO_UPLOAD_STATUS == 'M') { if ($qso->COL_HRDLOG_QSO_UPLOAD_STATUS == 'M') {
$result = $this->logbook_model->push_qso_to_hrdlog($hrdlog_username, $hrdlog_code, $adif, true); $result = $this->logbook_model->push_qso_to_hrdlog($hrdlog_username, $hrdlog_code, $adif, true);
} else { } else {
$result = $this->logbook_model->push_qso_to_hrdlog($hrdlog_username, $hrdlog_code, $adif); $result = $this->logbook_model->push_qso_to_hrdlog($hrdlog_username, $hrdlog_code, $adif);
} }
if (($result['status'] == 'OK') || (($result['status'] == 'error') || ($result['status'] == 'duplicate'))) { if (($result['status'] == 'OK') || (($result['status'] == 'error') || ($result['status'] == 'duplicate'))) {
$this->markqso($qso->COL_PRIMARY_KEY); $this->markqso($qso->COL_PRIMARY_KEY);
$i++; $i++;
$result['status'] = 'OK'; $result['status'] = 'OK';
} elseif ((substr($result['status'], 0, 11) == 'auth_error')) { } elseif ((substr($result['status'], 0, 11) == 'auth_error')) {
log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']); log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
log_message('error', 'hrdlog upload stopped for Station_ID: ' . $station_id); log_message('error', 'hrdlog upload stopped for Station_ID: ' . $station_id);
$errormessages[] = $result['message'] . 'Invalid HRDLog-Code, stopped at Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errormessages[] = $result['message'] . 'Invalid HRDLog-Code, stopped at Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
$result['status'] = 'Error'; $result['status'] = 'Error';
break; /* If key is invalid, immediate stop syncing for more QSOs of this station */ break; /* If key is invalid, immediate stop syncing for more QSOs of this station */
} else { } else {
log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']); log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
$result['status'] = 'Error'; $result['status'] = 'Error';
$errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
} }
} }
$result['count'] = $i; if ($i == 0) {
$result['errormessages'] = $errormessages; $result['status']='OK';
return $result; }
} else { $result['count'] = $i;
$result['status'] = 'Error'; $result['errormessages'] = $errormessages;
$result['count'] = $i; return $result;
$result['errormessages'] = $errormessages; } else {
return $result; $result['status'] = 'Error';
} $result['count'] = $i;
$result['errormessages'] = $errormessages;
return $result;
}
} }
/* /*