From 5e2690cb976f9d19125dd6b15e01121080a3e1e0 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 7 Oct 2019 22:11:51 +0100 Subject: [PATCH] only send QSOs to eQSL which have a station profile that has an eqsl qth nickname defined --- application/models/Logbook_model.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 39cbe39f..53ebec07 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -971,13 +971,11 @@ class Logbook_model extends CI_Model { $this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE'); $this->db->from('station_profile'); - $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left'); - $this->db->where('station_profile.eqslqthnickname !=', ''); + $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id AND station_profile.eqslqthnickname != ""','left'); $this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'Y'); $this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'I'); $this->db->or_where(array($this->config->item('table_name').'.COL_EQSL_QSL_SENT' => NULL)); return $this->db->get(); - } function import($record, $station_id = "0") {