From 7e33369dc8b27b20385ab055b662e06bbf369784 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 27 Nov 2018 00:25:15 +0100 Subject: Parser: add trip_table parameter to parsing functions To allow parsing into arbitrary trip_tables, add the corresponding parameter to the parsing functions and the parser state. Currently, all callers pass the global trip_table so there should be no change in functionality. These arguments will be replaced in subsequent commits. Signed-off-by: Berthold Stoeger --- core/import-shearwater.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/import-shearwater.c') diff --git a/core/import-shearwater.c b/core/import-shearwater.c index 451b04fe5..b4815d960 100644 --- a/core/import-shearwater.c +++ b/core/import-shearwater.c @@ -438,7 +438,7 @@ static int shearwater_cloud_dive(void *param, int columns, char **data, char **c } int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer, int size, - struct dive_table *table) + struct dive_table *table, struct trip_table *trips) { UNUSED(buffer); UNUSED(size); @@ -449,6 +449,7 @@ int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer init_parser_state(&state); state.target_table = table; + state.trips = trips; state.sql_handle = handle; // So far have not seen any sample rate in Shearwater Desktop @@ -468,7 +469,7 @@ int parse_shearwater_buffer(sqlite3 *handle, const char *url, const char *buffer } int parse_shearwater_cloud_buffer(sqlite3 *handle, const char *url, const char *buffer, int size, - struct dive_table *table) + struct dive_table *table, struct trip_table *trips) { UNUSED(buffer); UNUSED(size); @@ -479,6 +480,7 @@ int parse_shearwater_cloud_buffer(sqlite3 *handle, const char *url, const char * init_parser_state(&state); state.target_table = table; + state.trips = trips; state.sql_handle = handle; char get_dives[] = "select l.number,strftime('%s', DiveDate),location||' / '||site,buddy,notes,imperialUnits,maxDepth,maxTime,startSurfacePressure,computerSerial,computerModel,d.diveId,l.sampleRateMs FROM dive_details AS d JOIN dive_logs AS l ON d.diveId=l.diveId"; -- cgit v1.2.3-70-g09d2