From 41cf83583d129edde607654592a52fe7bff57dc7 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 17 Jun 2020 22:45:33 +0200 Subject: filter: load filter presets from XML files This is a bit painful: since we don't want to modify the filter presets when the user imports (as opposed to opens) a log, we have to provide a table where the parser stores the presets. Calling the parser is getting quite unwieldy, since many tables are passed. We probably should introduce a structure representing a full log-book at one point, which collects all the things that are saved to the log. Apart from that, this is simply the counterpart to saving to XML. The interpretation of the string data is performed by core functions, not the parser itself to avoid code duplication with the git parser. Signed-off-by: Berthold Stoeger --- core/file.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/file.h') diff --git a/core/file.h b/core/file.h index d282eb38b..1f692eb79 100644 --- a/core/file.h +++ b/core/file.h @@ -2,6 +2,8 @@ #ifndef FILE_H #define FILE_H +#include "filterpreset.h" + #include #include @@ -24,8 +26,8 @@ extern int datatrak_import(struct memblock *mem, struct memblock *wl_mem, struct extern void ostctools_import(const char *file, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); extern int readfile(const char *filename, struct memblock *mem); -extern int parse_file(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); -extern int try_to_open_zip(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); +extern int parse_file(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, filter_preset_table_t *filter_presets); +extern int try_to_open_zip(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, filter_preset_table_t *filter_presets); // Platform specific functions extern int subsurface_rename(const char *path, const char *newpath); -- cgit v1.2.3-70-g09d2