Skip QSOs in ADIF-Import which do not match the chosen station_profile
这个提交包含在:
父节点
850121ce1e
当前提交
34b3dce5f2
共有 2 个文件被更改,包括 7 次插入 和 1 次删除
|
|
@ -206,7 +206,7 @@ class adif extends CI_Controller {
|
||||||
|
|
||||||
|
|
||||||
$custom_errors .= $this->logbook_model->import($record, $this->input->post('station_profile'),
|
$custom_errors .= $this->logbook_model->import($record, $this->input->post('station_profile'),
|
||||||
$this->input->post('skipDuplicate'), $this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), $this->input->post('markHrd'), true, $this->input->post('operatorName'));
|
$this->input->post('skipDuplicate'), $this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), $this->input->post('markHrd'), true, $this->input->post('operatorName'))."<br/>";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2746,6 +2746,12 @@ class Logbook_model extends CI_Model {
|
||||||
return 'Station not accessible<br>';
|
return 'Station not accessible<br>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$station_profile=$CI->Stations->profile_clean($station_id);
|
||||||
|
$station_profile_call=$station_profile->station_callsign;
|
||||||
|
if (($station_id != 0) && ($record['station_callsign'] != $station_profile_call)) { // Check if station_call from import matches profile ONLY when submitting via GUI.
|
||||||
|
return "Wrong station_callsign ".$record['station_callsign']." while importing for ".$station_profile_call;
|
||||||
|
}
|
||||||
|
|
||||||
$CI =& get_instance();
|
$CI =& get_instance();
|
||||||
$CI->load->library('frequency');
|
$CI->load->library('frequency');
|
||||||
$my_error = "";
|
$my_error = "";
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用