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/import-csv.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'core/import-csv.h') diff --git a/core/import-csv.h b/core/import-csv.h index 38bd30b62..749849286 100644 --- a/core/import-csv.h +++ b/core/import-csv.h @@ -2,6 +2,8 @@ #ifndef IMPORTCSV_H #define IMPORTCSV_H +#include "filterpreset.h" + enum csv_format { CSV_DEPTH, CSV_TEMP, @@ -21,12 +23,15 @@ enum csv_format { extern "C" { #endif -int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); +int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate, struct dive_table *table, + struct trip_table *trips, struct dive_site_table *sites, filter_preset_table_t *filter_presets); int try_to_open_csv(struct memblock *mem, enum csv_format type, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); int parse_txt_file(const char *filename, const char *csv, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); -int parse_seabear_log(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); -int parse_manual_file(const char *filename, char **params, int pnr, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); +int parse_seabear_log(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, + filter_preset_table_t *filter_presets); +int parse_manual_file(const char *filename, char **params, int pnr, struct dive_table *table, struct trip_table *trips, + struct dive_site_table *sites, filter_preset_table_t *filter_presets); #ifdef __cplusplus } -- cgit v1.2.3-70-g09d2