summaryrefslogtreecommitdiffstats
path: root/core/import-divinglog.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/import-divinglog.c')
-rw-r--r--core/import-divinglog.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/import-divinglog.c b/core/import-divinglog.c
index 59ed75404..9ebd2b8ed 100644
--- a/core/import-divinglog.c
+++ b/core/import-divinglog.c
@@ -287,7 +287,7 @@ static int divinglog_dive(void *param, int columns, char **data, char **column)
state->cur_dive->when = (time_t)(atol(data[1]));
if (data[2])
- state->cur_dive->dive_site = find_or_create_dive_site_with_name(data[2], state->cur_dive->when, &dive_site_table);
+ state->cur_dive->dive_site = find_or_create_dive_site_with_name(data[2], state->cur_dive->when, state->sites);
if (data[3])
utf8_string(data[3], &state->cur_dive->buddy);
@@ -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 trip_table *trips)
+ struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites)
{
UNUSED(buffer);
UNUSED(size);
@@ -409,6 +409,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.sites = sites;
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)";