From ad50b55cb688d20f26ae333ed342be06c00a0ccc Mon Sep 17 00:00:00 2001 From: Alexandru Csete Date: Sat, 13 Feb 2016 22:21:23 +0100 Subject: [PATCH 1/3] Import ADIF 'comment' field in addition to 'notes'. PS: Perhaps 'notes' should go into COL_NOTES instead. --- application/models/logbook_model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 0f0e2710..73b800ef 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -735,7 +735,9 @@ class Logbook_model extends CI_Model { } // Store Notes - if(isset($record['notes'])) { + if (isset($record['comment'])) { + $comment = $record['comment']; + } else if (isset($record['notes'])) { $comment = $record['notes']; } else { $comment = ""; From e162044945619523edcf92ac3c24fe85ca438b77 Mon Sep 17 00:00:00 2001 From: Alexandru Csete Date: Sat, 13 Feb 2016 23:03:38 +0100 Subject: [PATCH 2/3] Import MY_RIG field from ADIF file. --- application/models/logbook_model.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 73b800ef..387ad52c 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -882,6 +882,13 @@ class Logbook_model extends CI_Model { $srx = null; } + // MY_RIG + if (isset($record['my_rig'])) { + $my_rig = $record['my_rig']; + } else { + $my_rig = null; + } + // Filter Modes if not apart of ADIF spec if($record['mode'] == "RTTY75") { // Set RTTY75 to just RTTY @@ -929,7 +936,8 @@ class Logbook_model extends CI_Model { 'COL_QSLSDATE' => $QSLSDATE, 'COL_QSL_SENT' => $QSLSENT, 'COL_LOTW_QSL_SENT' => $LOTWQSLSENT, - 'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD + 'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD, + 'COL_MY_RIG' => $my_rig ); // if eQSL username set, default SENT & RCVD to 'N' else leave as null From 0665a9b86efe32bf3b94b2a5db9d063dc0936501 Mon Sep 17 00:00:00 2001 From: Alexandru Csete Date: Sun, 14 Feb 2016 13:48:55 +0100 Subject: [PATCH 3/3] Import TX_PWR and MY_GRIDSQUARE from ADIF. --- application/models/logbook_model.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 387ad52c..2c03dbc3 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -889,6 +889,20 @@ class Logbook_model extends CI_Model { $my_rig = null; } + // TX_PWR + if (isset($record['tx_pwr'])) { + $tx_pwr = $record['tx_pwr']; + } else { + $tx_pwr = 0.0; + } + + // MY_GRIDSQUARE + if (isset($record['my_gridsquare'])) { + $my_gridsquare = $record['my_gridsquare']; + } else { + $my_gridsquare = null; + } + // Filter Modes if not apart of ADIF spec if($record['mode'] == "RTTY75") { // Set RTTY75 to just RTTY @@ -937,7 +951,9 @@ class Logbook_model extends CI_Model { 'COL_QSL_SENT' => $QSLSENT, 'COL_LOTW_QSL_SENT' => $LOTWQSLSENT, 'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD, - 'COL_MY_RIG' => $my_rig + 'COL_MY_RIG' => $my_rig, + 'COL_TX_PWR' => $tx_pwr, + 'COL_MY_GRIDSQUARE' => $my_gridsquare ); // if eQSL username set, default SENT & RCVD to 'N' else leave as null