From 37146c5742503becf75468fb07aab56011cb9101 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 28 Feb 2019 22:45:17 +0100 Subject: Parser: parse into custom dive site table To extend the undo system to dive sites, the importers and downloaders must not parse directly into the global dive site table. Instead, pass a dive_site_table argument to parse into. For now, always pass the global dive_site_table so that this commit should not cause any functional change. Signed-off-by: Berthold Stoeger --- core/import-cobalt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/import-cobalt.c') diff --git a/core/import-cobalt.c b/core/import-cobalt.c index 9bb78d6fd..0836a9c00 100644 --- a/core/import-cobalt.c +++ b/core/import-cobalt.c @@ -197,7 +197,7 @@ static int cobalt_dive(void *param, int columns, char **data, char **column) return 1; } sprintf(tmp, "%s / %s", location, location_site); - state->cur_dive->dive_site = find_or_create_dive_site_with_name(tmp, state->cur_dive->when, &dive_site_table); + state->cur_dive->dive_site = find_or_create_dive_site_with_name(tmp, state->cur_dive->when, state->sites); free(tmp); } free(location); @@ -217,7 +217,7 @@ static int cobalt_dive(void *param, int columns, char **data, char **column) int parse_cobalt_buffer(sqlite3 *handle, const char *url, const char *buffer, int size, - struct dive_table *table, struct trip_table *trips) + struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites) { UNUSED(buffer); UNUSED(size); @@ -229,6 +229,7 @@ int parse_cobalt_buffer(sqlite3 *handle, const char *url, const char *buffer, in init_parser_state(&state); state.target_table = table; state.trips = trips; + state.sites = sites; state.sql_handle = handle; char get_dives[] = "select Id,strftime('%s',DiveStartTime),LocationId,'buddy','notes',Units,(MaxDepthPressure*10000/SurfacePressure)-10000,DiveMinutes,SurfacePressure,SerialNumber,'model' from Dive where IsViewDeleted = 0"; -- cgit v1.2.3-70-g09d2