mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle Mulitple Seac Computers colliding during import

Browse source 
The Seac importer was getting samples based only on dive number,
which was causing samples from different computers but with the
same dive number to become interleaved.

To correct this, the SQL statement was updated to use the
dive_id to query for samples. The table schema uses dive_id
as a primary key, which will enforce uniqueness.

Additionally, deviceid is hashed from the the device_id string.

Reported-by: David Brebera <david.brebera@gmail.com>
Signed-off-by: Jim Wobser <james.wobser@gmail.com>
This commit is contained in:
Jim Wobser 2022-05-12 09:33:22 -04:00 committed by Dirk Hohndel
parent ef0a6b7bee
commit 89c6015cde
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/import-seac.c
View file

@ -17,6 +17,7 @@
#include "tag.h" #include "tag.h"
#include "errorhelper.h" #include "errorhelper.h"
#include <string.h> #include <string.h>
#include "divecomputer.h"
/* Process gas change event for seac database. /* Process gas change event for seac database.
* Create gas change event at the time of the * Create gas change event at the time of the
@ -51,7 +52,7 @@ static int seac_dive(void *param, int columns, char **data, char **column)
sqlite3 *handle = state->sql_handle; sqlite3 *handle = state->sql_handle;
sqlite3_stmt *sqlstmt; sqlite3_stmt *sqlstmt;
const char *get_samples = "SELECT dive_number, runtime_s, depth_cm, temperature_mCx10, active_O2_fr, first_stop_depth_cm, first_stop_time_s, ndl_tts_s, cns, gf_l, gf_h FROM dive_data WHERE dive_number = ? ORDER BY runtime_s ASC"; const char *get_samples = "SELECT dive_number, runtime_s, depth_cm, temperature_mCx10, active_O2_fr, first_stop_depth_cm, first_stop_time_s, ndl_tts_s, cns, gf_l, gf_h FROM dive_data WHERE dive_number = ? AND dive_id = ? ORDER BY runtime_s ASC";
/* 0 = dive_number /* 0 = dive_number
* 1 = runtime_s * 1 = runtime_s
* 2 = depth_cm * 2 = depth_cm
@ -192,6 +193,7 @@ static int seac_dive(void *param, int columns, char **data, char **column)
// Bind current dive number to sql statement // Bind current dive number to sql statement
sqlite3_bind_int(sqlstmt, 1, state->cur_dive->number); sqlite3_bind_int(sqlstmt, 1, state->cur_dive->number);
sqlite3_bind_int(sqlstmt, 2, atoi(data[13]));
// Catch a bad query // Catch a bad query
retval = sqlite3_step(sqlstmt); retval = sqlite3_step(sqlstmt);
@ -206,8 +208,9 @@ static int seac_dive(void *param, int columns, char **data, char **column)
utf8_string(data[1], &state->cur_dive->dc.serial); utf8_string(data[1], &state->cur_dive->dc.serial);
utf8_string(data[12], &state->cur_dive->dc.fw_version); utf8_string(data[12], &state->cur_dive->dc.fw_version);
state->cur_dive->dc.model = strdup("Seac Action"); state->cur_dive->dc.model = strdup("Seac Action");
// TODO: Calculate device hash from string
state->cur_dive->dc.deviceid = 0xffffffff; state->cur_dive->dc.deviceid = calculate_string_hash(data[1]);
add_extra_data(&state->cur_dive->dc, "GF-Lo", (const char*)sqlite3_column_text(sqlstmt, 9)); add_extra_data(&state->cur_dive->dc, "GF-Lo", (const char*)sqlite3_column_text(sqlstmt, 9));
add_extra_data(&state->cur_dive->dc, "GF-Hi", (const char*)sqlite3_column_text(sqlstmt, 10)); add_extra_data(&state->cur_dive->dc, "GF-Hi", (const char*)sqlite3_column_text(sqlstmt, 10));
@ -277,7 +280,7 @@ int parse_seac_buffer(sqlite3 *handle, const char *url, const char *buffer, int
state.devices = devices; state.devices = devices;
state.sql_handle = handle; state.sql_handle = handle;
const char *get_dives = "SELECT dive_number, device_sn, date, timezone, time, elapsed_surface_time, dive_type, start_mode, water_type, comment, total_dive_time, max_depth, firmware_version FROM headers_dive"; const char *get_dives = "SELECT dive_number, device_sn, date, timezone, time, elapsed_surface_time, dive_type, start_mode, water_type, comment, total_dive_time, max_depth, firmware_version, dive_id FROM headers_dive";
/* 0 = dive_number /* 0 = dive_number
* 1 = device_sn * 1 = device_sn
* 2 = date * 2 = date
@ -291,6 +294,7 @@ int parse_seac_buffer(sqlite3 *handle, const char *url, const char *buffer, int
* 10 = total_dive_time * 10 = total_dive_time
* 11 = max_depth * 11 = max_depth
* 12 = firmware version * 12 = firmware version
* 13 = dive_id
*/ */
retval = sqlite3_exec(handle, get_dives, &seac_dive, &state, &err); retval = sqlite3_exec(handle, get_dives, &seac_dive, &state, &err);