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

Merge pull request #2830 from int2001/qrz_workarounds

浏览代码 
Heal some strange behaviours of qrz-qsls
这个提交包含在：
Peter Goodhall 2023-12-14 13:31:56 +00:00 提交者 GitHub
当前提交 64554939eb
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 19 次插入 和 16 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/controllers/Qrz.php
查看文件

@ -332,6 +332,8 @@ class Qrz extends CI_Controller {
$record['qsl_rcvd'] = $config['qrz_rcvd_mark']; $record['qsl_rcvd'] = $config['qrz_rcvd_mark'];
} }
$record['call']=str_replace("_","/",$record['call']);
$record['station_callsign']=str_replace("_","/",$record['station_callsign']);
$status = $this->logbook_model->import_check($time_on, $record['call'], $record['band'], $record['mode'], $record['station_callsign']); $status = $this->logbook_model->import_check($time_on, $record['call'], $record['band'], $record['mode'], $record['station_callsign']);
if($status[0] == "Found") { if($status[0] == "Found") {

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

@ -2907,26 +2907,27 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
} }
/* Used to check if the qso is already in the database */ /* Used to check if the qso is already in the database */
function import_check($datetime, $callsign, $band, $mode, $station_callsign) { function import_check($datetime, $callsign, $band, $mode, $station_callsign) {
$mode=$this->get_main_mode_from_mode($mode);
$this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND'); $this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND');
$this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )'); $this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
$this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )'); $this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )');
$this->db->where('COL_CALL', $callsign); $this->db->where('COL_CALL', $callsign);
$this->db->where('COL_STATION_CALLSIGN', $station_callsign); $this->db->where('COL_STATION_CALLSIGN', $station_callsign);
$this->db->where('COL_BAND', $band); $this->db->where('COL_BAND', $band);
$this->db->where('COL_MODE', $mode); $this->db->where('COL_MODE', $mode);
$query = $this->db->get($this->config->item('table_name')); $query = $this->db->get($this->config->item('table_name'));
if ($query->num_rows() > 0) if ($query->num_rows() > 0)
{ {
$ret = $query->row(); $ret = $query->row();
return ["Found", $ret->COL_PRIMARY_KEY]; return ["Found", $ret->COL_PRIMARY_KEY];
} else { } else {
return ["No Match", 0]; return ["No Match", 0];
}
} }
}
function qrz_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $station_callsign) { function qrz_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $station_callsign) {