From ac625399ff84014538168c6a93a7a1a93bf19069 Mon Sep 17 00:00:00 2001
From: Andy <teabreakninja@github.com>
Date: Tue, 8 Mar 2016 14:10:08 +0000
Subject: [PATCH] Read 'comment' field in ADIF import

---
 application/models/logbook_model.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index dd568eac..c3b30f95 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -567,8 +567,8 @@ class Logbook_model extends CI_Model {
     function import_check($datetime, $callsign, $band) {
 
 		$this->db->select('COL_TIME_ON, COL_CALL, COL_BAND');
-		$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_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
+		$this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )');
 		$this->db->where('COL_CALL', $callsign);
 		$this->db->where('COL_BAND', $band);
 
@@ -620,8 +620,8 @@ class Logbook_model extends CI_Model {
 			   'COL_EQSL_QSL_RCVD' => $qsl_status
 		);
 
-		$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_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
+		$this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )');
 		$this->db->where('COL_CALL', $callsign);
 		$this->db->where('COL_BAND', $band);
 
@@ -666,8 +666,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('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_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
+		$this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )');
     	$this->db->where('COL_CALL', $callsign);
     	$this->db->where('COL_BAND', $band);
     	$this->db->where('COL_EQSL_QSL_RCVD', $qsl_status);
@@ -738,7 +738,12 @@ class Logbook_model extends CI_Model {
         if(isset($record['notes'])) {
             $comment = $record['notes'];
         } else {
-            $comment = "";
+            // Try 'comment'
+            if(isset($record['comment'])){
+                $comment = $record['comment'];
+            }else{
+                $comment = "";
+            }
         }
 
         // Store Sat Name