Support batch updates by primary key

Allow LoTW batch updates to reference QSOs by COL_PRIMARY_KEY for reliable matching. Controller: include 'primary_key' in batch update payloads. Model: collect numeric primary keys, expand WHERE to include COL_PRIMARY_KEY IN (...) alongside the existing datetime/call/band/station match, add early exit/log when no usable keys provided, and build an id-based lookup (qso_map_by_id) to prefer primary-key matches while remaining backward-compatible with the composite key lookup. This reduces ambiguous matches and improves update accuracy.

Author: magicbug

application/controllers/Lotw.php

@@ -562,6 +562,7 @@ private function loadFromFile($filepath, $display_view = "TRUE")
 
 					// Add to batch update array
 					$batch_updates[] = array(
+						'primary_key' => $status[1],
 						'datetime' => $time_on,
 						'callsign' => $record['call'],
 						'band' => $record['band'],

application/models/Logbook_model.php

@@ -3623,7 +3623,13 @@ function lotw_update_batch($records)
 
     // Step 1: Build WHERE conditions to find all matching QSOs and their current upload status
     $match_conditions = array();
-    foreach ($records as $idx => $record) {
+    $primary_keys = array();
+    foreach ($records as $record) {
+      if (!empty($record['primary_key'])) {
+        $primary_keys[] = (int)$record['primary_key'];
+        continue;
+      }
+
       $match_conditions[] = sprintf(
         "(date_format(COL_TIME_ON, '%%Y-%%m-%%d %%H:%%i') = '%s' AND COL_CALL = '%s' AND COL_BAND = '%s' AND COL_STATION_CALLSIGN = '%s')",
         $this->db->escape_str($record['datetime']),
@@ -3632,6 +3638,19 @@ function lotw_update_batch($records)
         $this->db->escape_str($record['station_callsign'])
       );
     }
+
+    $where_parts = array();
+    if (!empty($primary_keys)) {
+      $where_parts[] = 'COL_PRIMARY_KEY IN (' . implode(',', array_unique($primary_keys)) . ')';
+    }
+    if (!empty($match_conditions)) {
+      $where_parts[] = '(' . implode(' OR ', $match_conditions) . ')';
+    }
+
+    if (empty($where_parts)) {
+      log_message('warning', 'LoTW batch update: No usable keys provided');
+      return array('updated' => 0, 'gridsquare_updated' => 0, 'errors' => 0);
+    }
 
     // Step 2: Get all matching QSOs with their current upload status and gridsquare
     $sql = "SELECT COL_PRIMARY_KEY, 
@@ -3644,7 +3663,7 @@ function lotw_update_batch($records)
                    station_profile.station_id
             FROM {$table_name}
             LEFT JOIN station_profile ON {$table_name}.station_id = station_profile.station_id
-            WHERE (" . implode(' OR ', $match_conditions) . ")";
+            WHERE " . implode(' OR ', $where_parts);
 
     $query = $this->db->query($sql);
 
@@ -3655,7 +3674,9 @@ function lotw_update_batch($records)
 
     // Step 3: Build lookup map and batch update array
     $qso_map = array();
+    $qso_map_by_id = array();
     foreach ($query->result() as $qso) {
+      $qso_map_by_id[$qso->COL_PRIMARY_KEY] = $qso;
       $key = $qso->fmt_time . '|' . $qso->COL_CALL . '|' . $qso->COL_BAND . '|' . $qso->COL_STATION_CALLSIGN;
       $qso_map[$key] = $qso;
     }
@@ -3664,14 +3685,20 @@ function lotw_update_batch($records)
     $gridsquare_updates = array();
 
     foreach ($records as $record) {
-      $key = $record['datetime'] . '|' . $record['callsign'] . '|' . $record['band'] . '|' . $record['station_callsign'];
-      
-      if (!isset($qso_map[$key])) {
+      $qso = null;
+      if (!empty($record['primary_key']) && isset($qso_map_by_id[(int)$record['primary_key']])) {
+        $qso = $qso_map_by_id[(int)$record['primary_key']];
+      } else {
+        $key = $record['datetime'] . '|' . $record['callsign'] . '|' . $record['band'] . '|' . $record['station_callsign'];
+        if (isset($qso_map[$key])) {
+          $qso = $qso_map[$key];
+        }
+      }
+
+      if ($qso === null) {
         continue; // QSO not found in database
       }
 
-      $qso = $qso_map[$key];
-      
       // Skip if already updated with this exact status
       if ($qso->COL_LOTW_QSL_RCVD == $record['qsl_status']) {
         continue;