From 3c8d77d01299696469b0271b89b1d7c172fca2e2 Mon Sep 17 00:00:00 2001 From: Corby Krick Date: Sat, 9 Nov 2013 15:13:42 -0600 Subject: [PATCH] Making the eQSL update query times fuzzy to account to ops logging slightly different times. We are now +/- 5 minutes. --- application/models/logbook_model.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index d90cd4101..cbd04af04 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -606,11 +606,12 @@ class Logbook_model extends CI_Model { // http://www.eqsl.cc/qslcard/ImportADIF.txt function eqsl_update($datetime, $callsign, $band, $qsl_status) { $data = array( - 'COL_EQSL_QSLRDATE' => 'CURRENT_TIMESTAMP', // eQSL doesn't give us a date, so let's use current - 'COL_EQSL_QSL_RCVD' => $qsl_status, + 'COL_EQSL_QSLRDATE' => date('Y-m-d'), // eQSL doesn't give us a date, so let's use current + 'COL_EQSL_QSL_RCVD' => $qsl_status ); - $this->db->where('date_format(COL_TIME_ON, \'%Y-%m-%d %H:%i\') = "'.$datetime.'"'); + $this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -5 MINUTE )'); + $this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 5 MINUTE )'); $this->db->where('COL_CALL', $callsign); $this->db->where('COL_BAND', $band); @@ -622,7 +623,7 @@ class Logbook_model extends CI_Model { // Mark the QSO as sent to eQSL function eqsl_mark_sent($primarykey) { $data = array( - 'COL_EQSL_QSLSDATE' => 'CURRENT_TIMESTAMP', // eQSL doesn't give us a date, so let's use current + 'COL_EQSL_QSLSDATE' => date('Y-m-d'), // eQSL doesn't give us a date, so let's use current 'COL_EQSL_QSL_SENT' => 'Y', ); @@ -649,7 +650,8 @@ class Logbook_model extends CI_Model { // Determine if we've already received an eQSL for this QSO function eqsl_dupe_check($datetime, $callsign, $band, $qsl_status) { $this->db->select('COL_EQSL_QSLRDATE'); - $this->db->where('date_format(COL_TIME_ON, \'%Y-%m-%d %H:%i\') = "'.$datetime.'"'); + $this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -5 MINUTE )'); + $this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 5 MINUTE )'); $this->db->where('COL_CALL', $callsign); $this->db->where('COL_BAND', $band); $this->db->where('COL_EQSL_QSL_RCVD', $qsl_status);