mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parser: parse text-based files into arbitrary table

Browse source 
In d815e0c947 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>
This commit is contained in:
Berthold Stoeger 2018-09-28 13:59:01 +02:00 • committed by Dirk Hohndel
parent a5db03c2b3
commit 32a4ce6169
10 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/testparse.cpp
View file

@ -107,7 +107,7 @@ int TestParse::parseCSV(int units, std::string file)
params[pnr++] = intdup(-1);
params[pnr++] = NULL;
return parse_manual_file(file.c_str(), params, pnr - 1);
return parse_manual_file(file.c_str(), params, pnr - 1, &dive_table);
}
int TestParse::parseDivingLog()
@ -216,7 +216,7 @@ void TestParse::testParseHUDC()
params[pnr++] = NULL;
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearHUDC.csv",
params, pnr - 1, "csv"),
params, pnr - 1, "csv", &dive_table),
0);
QCOMPARE(dive_table.nr, 1);
@ -261,7 +261,7 @@ void TestParse::testParseNewFormat()
"/dives/")
.append(files.at(i))
.toLatin1()
.data()),
.data(), &dive_table),
0);
QCOMPARE(dive_table.nr, i + 1);
}
@ -367,7 +367,7 @@ int TestParse::parseCSVmanual(int units, std::string file)
params[pnr++] = intdup(units);
params[pnr++] = NULL;
return parse_manual_file(file.c_str(), params, pnr - 1);
return parse_manual_file(file.c_str(), params, pnr - 1, &dive_table);
}
void TestParse::exportCSVDiveDetails()
@ -416,7 +416,7 @@ int TestParse::parseCSVprofile(int units, std::string file)
params[pnr++] = intdup(units);
params[pnr++] = NULL;
return parse_csv_file(file.c_str(), params, pnr - 1, "csv");
return parse_csv_file(file.c_str(), params, pnr - 1, "csv", &dive_table);
}
void TestParse::exportCSVDiveProfile()
@ -510,7 +510,7 @@ void TestParse::parseDL7()
clear_dive_file_data();
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/DL7.zxu",
params, pnr - 1, "DL7"),
params, pnr - 1, "DL7", &dive_table),
0);
QCOMPARE(dive_table.nr, 3);