From f501291d2c67bc9531780a0a6baf4e4b822ddf3f Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 11 Jul 2024 20:18:22 +0200 Subject: [PATCH 1/2] Prevent RPT and INTERNET QSOs to be uploaded to LoTW --- application/models/Logbook_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 8a06cb986..f79d8656a 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4852,6 +4852,9 @@ function lotw_last_qsl_date($user_id) { function get_lotw_qsos_to_upload($station_id, $start_date, $end_date) { + // Missing in tqsl 2.7.3 config.xml + $lotw_upsupported_modes = array('INTERNET', 'RPT'); + $this->db->select('COL_PRIMARY_KEY,COL_CALL, COL_BAND, COL_BAND_RX, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_FREQ, COL_FREQ_RX, COL_GRIDSQUARE, COL_SAT_NAME, COL_PROP_MODE, COL_LOTW_QSL_SENT, station_id'); $this->db->where("station_id", $station_id); @@ -4859,7 +4862,7 @@ function lotw_last_qsl_date($user_id) { $this->db->where('COL_LOTW_QSL_SENT', NULL); $this->db->or_where('COL_LOTW_QSL_SENT !=', "Y"); $this->db->group_end(); - $this->db->where('COL_PROP_MODE !=', "INTERNET"); + $this->db->where_not_in('COL_PROP_MODE', $lotw_upsupported_modes); $this->db->where('COL_TIME_ON >=', $start_date); $this->db->where('COL_TIME_ON <=', $end_date); $this->db->order_by("COL_TIME_ON", "desc"); From 83cde5b853933e25b10c0bf125228c6d88944556 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 11 Jul 2024 20:19:57 +0200 Subject: [PATCH 2/2] Fix typo --- application/models/Logbook_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f79d8656a..0ecebf935 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4853,7 +4853,7 @@ function lotw_last_qsl_date($user_id) { function get_lotw_qsos_to_upload($station_id, $start_date, $end_date) { // Missing in tqsl 2.7.3 config.xml - $lotw_upsupported_modes = array('INTERNET', 'RPT'); + $lotw_unsupported_modes = array('INTERNET', 'RPT'); $this->db->select('COL_PRIMARY_KEY,COL_CALL, COL_BAND, COL_BAND_RX, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_FREQ, COL_FREQ_RX, COL_GRIDSQUARE, COL_SAT_NAME, COL_PROP_MODE, COL_LOTW_QSL_SENT, station_id'); @@ -4862,7 +4862,7 @@ function lotw_last_qsl_date($user_id) { $this->db->where('COL_LOTW_QSL_SENT', NULL); $this->db->or_where('COL_LOTW_QSL_SENT !=', "Y"); $this->db->group_end(); - $this->db->where_not_in('COL_PROP_MODE', $lotw_upsupported_modes); + $this->db->where_not_in('COL_PROP_MODE', $lotw_unsupported_modes); $this->db->where('COL_TIME_ON >=', $start_date); $this->db->where('COL_TIME_ON <=', $end_date); $this->db->order_by("COL_TIME_ON", "desc");