Merge pull request #190 from csete/adif

Import comments field in addition to notes, also my_rig, tx_pwr and my_gridsquare, when processing ADIF Files.

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 = "";
@@ -880,6 +882,27 @@ class Logbook_model extends CI_Model {
                 $srx = null;
         }
 
+        // MY_RIG
+        if (isset($record['my_rig'])) {
+            $my_rig = $record['my_rig'];
+        } else {
+            $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
@@ -927,7 +950,10 @@ 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,
+               'COL_TX_PWR' => $tx_pwr,
+               'COL_MY_GRIDSQUARE' => $my_gridsquare
             );
 
             // if eQSL username set, default SENT & RCVD to 'N' else leave as null