Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQL join of QSO (affects QSOs without sat_name joined with

Browse Source 
satellites with empty name)
This commit is contained in:
phl0
2026-02-25 09:45:54 +01:00
parent f74e3c54a2
commit d8226a7550
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/Timeline_model.php
View File

@@ -340,7 +340,7 @@ class Timeline_model extends CI_Model {
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer'); $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer');
$this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer');
$this->db->join('satellite', 'satellite.name = '.$this->config->item('table_name').'.COL_SAT_NAME', 'left outer'); $this->db->join('satellite', $this->config->item('table_name').'.COL_PROP_MODE = "SAT" AND '.$this->config->item('table_name').'.COL_SAT_NAME = COALESCE(NULLIF(satellite.name, ""), NULLIF(satellite.displayname, ""))', 'left outer');
if ($band == 'SAT') { // Left for compatibility reasons if ($band == 'SAT') { // Left for compatibility reasons
$this->db->where('col_prop_mode', $band); $this->db->where('col_prop_mode', $band);
@@ -377,7 +377,7 @@ class Timeline_model extends CI_Model {
case 'iota': $this->db->where('COL_IOTA', $querystring); break; case 'iota': $this->db->where('COL_IOTA', $querystring); break;
case 'waz': $this->db->where('COL_CQZ', $querystring); break; case 'waz': $this->db->where('COL_CQZ', $querystring); break;
case 'vucc': $this->db->group_start(); $this->db->like('COL_GRIDSQUARE', $querystring); $this->db->or_like('COL_VUCC_GRIDS',$querystring); $this->db->group_end();break; case 'vucc': $this->db->group_start(); $this->db->like('COL_GRIDSQUARE', $querystring); $this->db->or_like('COL_VUCC_GRIDS',$querystring); $this->db->group_end();break;
case 'waja': $this->db->where('COL_STATE', $querystring); $this->db->where('COL_DXCC','339'); break; case 'waja': $this->db->where('COL_STATE', $querystring); $this->db->where('COL_DXCC','339'); break;
} }
$this->db->order_by('COL_TIME_ON', 'DESC'); $this->db->order_by('COL_TIME_ON', 'DESC');