From 4b949936c26d5689c331d7c7e25b8c130e97c0e5 Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sat, 15 Feb 2014 08:36:49 +0200 Subject: Refactoring sqlite import support Move the opening of DB connection to occur before DC dependent code. This way we can try to detect log software before calling the DC dependent import function. This prepares for adding support for Shearwater sqlite database. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- file.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'file.c') diff --git a/file.c b/file.c index 8157e9a60..b218a13e2 100644 --- a/file.c +++ b/file.c @@ -153,7 +153,20 @@ static int try_to_xslt_open_csv(const char *filename, struct memblock *mem, char static int try_to_open_db(const char *filename, struct memblock *mem, char **error) { - return parse_dm4_buffer(filename, mem->buffer, mem->size, &dive_table, error); + sqlite3 *handle; + int retval; + + retval = sqlite3_open(filename, &handle); + + if (retval) { + fprintf(stderr, translate("gettextFromC","Database connection failed '%s'.\n"), filename); + return 1; + } + + retval = parse_dm4_buffer(handle, filename, mem->buffer, mem->size, &dive_table, error); + sqlite3_close(handle); + + return retval; } timestamp_t parse_date(const char *date) -- cgit v1.2.3-70-g09d2