From 2dc2badefdac44ace2078da3661dc698712d1d87 Mon Sep 17 00:00:00 2001
From: DJ3CE <dj3ce@darc.de>
Date: Mon, 20 Jan 2025 22:56:35 +0100
Subject: [PATCH] Fix my_country in search

---
 application/controllers/Search.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Search.php b/application/controllers/Search.php
index a643b0477..3e22502ef 100644
--- a/application/controllers/Search.php
+++ b/application/controllers/Search.php
@@ -104,7 +104,8 @@ class Search extends CI_Controller {
 	}
 
 	function export_to_adif() {
-		$data['qsos'] = $this->fetchQueryResult(($this->input->post('search', TRUE) ?? ''), FALSE);
+		$sstring = str_replace('Ø', "0", $this->input->post("search", TRUE) ?? '');
+		$data['qsos'] = $this->fetchQueryResult($sstring, FALSE);
 		$this->load->view('adif/data/exportall', $data);
 	}
 
@@ -304,7 +305,7 @@ class Search extends CI_Controller {
 
 		$this->db->order_by('COL_TIME_ON', 'DESC');
 		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
-		$this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
+		$this->db->join('dxcc_entities', 'station_profile.station_dxcc = dxcc_entities.adif', 'left');
 		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 		$this->db->limit(5000);