From 79f51cc5dc6ecc7a6b6e847ce835cf76709f2cb1 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:38:04 +0100
Subject: [PATCH 1/2] [Award] RAC speedup

---
 application/models/Rac.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/models/Rac.php b/application/models/Rac.php
index 8c9c7d498..94964e7e9 100644
--- a/application/models/Rac.php
+++ b/application/models/Rac.php
@@ -6,12 +6,11 @@ class rac extends CI_Model {
 		$this->load->library('Genfunctions');
 	}
 
-	public $stateString = 'AB,BC,MB,NB,NL,NT,NS,NU,ON,PE,QC,SK,YT';
+	private $stateString = 'AB,BC,MB,NB,NL,NT,NS,NU,ON,PE,QC,SK,YT';
 
 	function get_rac_array($bands, $postdata) {
-		$CI =& get_instance();
-		$CI->load->model('logbooks_model');
-		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+		$this->load->model('logbooks_model');
+		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
 		if (!$logbooks_locations_array) {
 			return null;
@@ -258,7 +257,7 @@ class rac extends CI_Model {
 
 	function addStateToQuery() {
 		$sql = '';
-		$sql .= " and COL_DXCC = 1";
+		$sql .= " and COL_DXCC in ('1')";
 		$sql .= " and COL_STATE in ('AB','BC','MB','NB','NL','NT','NS','NU','ON','PE','QC','SK','YT')";
 		return $sql;
 	}

From f6681be47a439504497f18eb8b98cace1a05cbf5 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:51:42 +0100
Subject: [PATCH 2/2] Same with WAP and H26

---
 application/models/Helvetia_model.php | 4 ++--
 application/models/Wap.php            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/models/Helvetia_model.php b/application/models/Helvetia_model.php
index 4cefc69f6..8e88f35a2 100644
--- a/application/models/Helvetia_model.php
+++ b/application/models/Helvetia_model.php
@@ -132,7 +132,7 @@ class helvetia_model extends CI_Model {
 		} else {
 			$sql .= " and thcv.col_prop_mode !='SAT'";
 			$sql .= " and thcv.col_band = ?";
-			$binding[] = $band;	
+			$binding[] = $band;
 		}
 
 		if ($postdata['mode'] != 'All') {
@@ -256,7 +256,7 @@ class helvetia_model extends CI_Model {
 
 	function addStateToQuery() {
 		$sql = '';
-		$sql .= " and COL_DXCC = 287";
+		$sql .= " and COL_DXCC in ('287')";
 		$sql .= " and COL_STATE in ('AG','AI','AR','BE','BL','BS','FR','GE','GL','GR','JU','LU','NE','NW','OW','SG','SH','SO','SZ','TG','TI','UR','VD','VS','ZG','ZH')";
 		return $sql;
 	}
diff --git a/application/models/Wap.php b/application/models/Wap.php
index c27c566cf..b2304c762 100644
--- a/application/models/Wap.php
+++ b/application/models/Wap.php
@@ -259,7 +259,7 @@ class wap extends CI_Model {
 
 	function addStateToQuery() {
 		$sql = '';
-		$sql .= " and COL_DXCC = 263";
+		$sql .= " and COL_DXCC in ('263')";
 		$sql .= " and COL_STATE in ('DR','FL','FR','GD','GR','LB','NB','NH','OV','UT','ZH','ZL')";
 
 		return $sql;