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

Merge pull request #2907 from AndreasK79/rac_speed

Browse Source 
[Award] RAC speedup
This commit is contained in:
Andreas Kristiansen
2026-02-04 20:23:15 +01:00
committed by GitHub
parent 86480f0bbe f6681be47a
commit 1eb7bf7718
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/Helvetia_model.php
View File

@@ -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;
}

9
application/models/Rac.php
View File

@@ -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;
}

2
application/models/Wap.php
View File

@@ -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;