summaryrefslogtreecommitdiffstats
path: root/core/import-divinglog.c
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-11-27 00:25:15 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-01-09 20:58:04 -0800
commit7e33369dc8b27b20385ab055b662e06bbf369784 (patch)
treeaf674ccdd1ccb67d4de84d68cb585b481d020fb3 /core/import-divinglog.c
parentec37c71f5eeb7d4b0c4b8719b52583fadb0b8f4c (diff)
downloadsubsurface-7e33369dc8b27b20385ab055b662e06bbf369784.tar.gz
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-divinglog.c')
-rw-r--r--core/import-divinglog.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/import-divinglog.c b/core/import-divinglog.c
index 66a9ba2c0..ee5dccbd0 100644
--- a/core/import-divinglog.c
+++ b/core/import-divinglog.c
@@ -397,7 +397,7 @@ static int divinglog_dive(void *param, int columns, char **data, char **column)
int parse_divinglog_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);
@@ -408,6 +408,7 @@ int parse_divinglog_buffer(sqlite3 *handle, const char *url, const char *buffer,
init_parser_state(&state);
state.target_table = table;
+ state.trips = trips;
state.sql_handle = handle;
char get_dives[] = "select Number,strftime('%s',Divedate || ' ' || ifnull(Entrytime,'00:00')),Country || ' - ' || City || ' - ' || Place,Buddy,Comments,Depth,Divetime,Divemaster,Airtemp,Watertemp,Weight,Divesuit,Computer,ID,Visibility,SupplyType from Logbook where UUID not in (select UUID from DeletedRecords)";