diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-09-28 13:59:01 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-28 15:06:00 -0700 |
| commit | 32a4ce61694bfe8364227440ea5716df7cc61fd1 (patch) | |
| tree | 257ac4f9204182b20d7e4bda7bc80911bc6303a6 /core/file.c | |
| parent | a5db03c2b32115b14e4b83501a0771b186d87913 (diff) | |
| download | subsurface-32a4ce61694bfe8364227440ea5716df7cc61fd1.tar.gz | |
Parser: parse text-based files into arbitrary table
In d815e0c9476ef62e6b84fb28ce48ab7cddefe77e a dive_table pointer
was added to the parsing functions to allow parsing into tables
other than the global dive table. This will be necessary for undo of
import and implementation a cleaner interface. A few cases, notably
CSV and proprietary formats were forgotten.
Implement parsing into arbitrary tables also for these cases.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/file.c')
| -rw-r--r-- | core/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/file.c b/core/file.c index abef20a7d..6f2edcf8d 100644 --- a/core/file.c +++ b/core/file.c @@ -220,16 +220,16 @@ static int open_by_filename(const char *filename, const char *fmt, struct memblo return report_error(translate("gettextFromC", csv_warning), filename); /* Truly nasty intentionally obfuscated Cochran Anal software */ if (!strcasecmp(fmt, "CAN")) - return try_to_open_cochran(filename, mem); + return try_to_open_cochran(filename, mem, table); /* Cochran export comma-separated-value files */ if (!strcasecmp(fmt, "DPT")) - return try_to_open_csv(mem, CSV_DEPTH); + return try_to_open_csv(mem, CSV_DEPTH, table); if (!strcasecmp(fmt, "LVD")) - return try_to_open_liquivision(filename, mem); + return try_to_open_liquivision(filename, mem, table); if (!strcasecmp(fmt, "TMP")) - return try_to_open_csv(mem, CSV_TEMP); + return try_to_open_csv(mem, CSV_TEMP, table); if (!strcasecmp(fmt, "HP1")) - return try_to_open_csv(mem, CSV_PRESSURE); + return try_to_open_csv(mem, CSV_PRESSURE, table); return 0; } |