From 4a9ec6e87f4d027d38c59284248adf11bd918f0e Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 25 Jul 2023 12:50:07 +0000 Subject: [PATCH] Removed old API-Endpoints for country_ and grid_worked --- application/controllers/Api.php | 13 -------- application/models/Api_model.php | 52 -------------------------------- 2 files changed, 65 deletions(-) diff --git a/application/controllers/Api.php b/application/controllers/Api.php index ceaa192a..d43a3b3f 100644 --- a/application/controllers/Api.php +++ b/application/controllers/Api.php @@ -618,19 +618,6 @@ class API extends CI_Controller { } - function country_worked($dxcc_num, $band, $mode = NULL) { - $this->load->model('api_model'); - - echo $this->api_model->country_worked($dxcc_num, $band, $mode); - } - - function gridsquare_worked($gridsquare, $band, $mode = NULL) { - $this->load->model('api_model'); - - echo $this->api_model->gridsquare_worked($gridsquare, $band, $mode); - } - - /* ENDPOINT for Rig Control */ function radio() { diff --git a/application/models/Api_model.php b/application/models/Api_model.php index f65b5501..1cc767ca 100644 --- a/application/models/Api_model.php +++ b/application/models/Api_model.php @@ -61,58 +61,6 @@ class API_Model extends CI_Model { } - function country_worked($dxcc_num, $band, $mode){ - - if($band == "all") { - if($mode != NULL) { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_MODE = "'.$mode.'"'); - } else { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'"'); - } - } else { - if($mode != NULL) { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"'); - } else { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'"'); - } - } - - if ($query->num_rows() > 0) - { - foreach ($query->result() as $row) - { - return $row->count; - } - } - } - - - function gridsquare_worked($gridsquare, $band, $mode){ - - if($band == "all") { - if($mode != NULL) { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_MODE = "'.$mode.'"'); - } else { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%"'); - } - } else { - if($mode != NULL) { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"'); - } else { - $query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND ="'.$band.'"'); - } - } - - if ($query->num_rows() > 0) - { - foreach ($query->result() as $row) - { - return $row->count; - } - } - } - - function delete_key($key) { $this->db->where('user_id', $this->session->userdata('user_id'));