2017-04-27 18:21:27 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2015-03-10 21:27:14 +00:00
|
|
|
#include "testparse.h"
|
2020-10-17 10:32:22 +00:00
|
|
|
#include "core/device.h"
|
2020-10-25 12:28:55 +00:00
|
|
|
#include "core/dive.h"
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
#include "core/divelog.h"
|
2019-03-04 22:20:29 +00:00
|
|
|
#include "core/divesite.h"
|
2019-08-05 17:41:15 +00:00
|
|
|
#include "core/errorhelper.h"
|
2019-05-31 14:09:14 +00:00
|
|
|
#include "core/trip.h"
|
2018-07-25 19:39:04 +00:00
|
|
|
#include "core/file.h"
|
2018-09-28 10:09:18 +00:00
|
|
|
#include "core/import-csv.h"
|
2018-07-25 19:39:04 +00:00
|
|
|
#include "core/parse.h"
|
2017-05-07 06:41:27 +00:00
|
|
|
#include "core/qthelper.h"
|
2018-07-25 19:39:04 +00:00
|
|
|
#include "core/subsurface-string.h"
|
2020-10-17 18:15:23 +00:00
|
|
|
#include "core/xmlparams.h"
|
2018-07-25 19:39:04 +00:00
|
|
|
#include <QTextStream>
|
2015-03-10 21:27:14 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
/* We have to use a macro since QCOMPARE
|
|
|
|
* can only be called from a test method
|
|
|
|
* invoked by the QTest framework
|
|
|
|
*/
|
2018-07-25 19:39:04 +00:00
|
|
|
#define FILE_COMPARE(actual, expected) \
|
|
|
|
QFile org(expected); \
|
|
|
|
org.open(QFile::ReadOnly); \
|
|
|
|
QFile out(actual); \
|
|
|
|
out.open(QFile::ReadOnly); \
|
|
|
|
QTextStream orgS(&org); \
|
|
|
|
QTextStream outS(&out); \
|
|
|
|
QStringList readin = orgS.readAll().split("\n"); \
|
|
|
|
QStringList written = outS.readAll().split("\n"); \
|
|
|
|
while (readin.size() && written.size()) { \
|
|
|
|
QCOMPARE(written.takeFirst().trimmed(), \
|
|
|
|
readin.takeFirst().trimmed()); \
|
|
|
|
}
|
2017-03-04 15:06:52 +00:00
|
|
|
|
2016-12-27 12:31:30 +00:00
|
|
|
void TestParse::initTestCase()
|
|
|
|
{
|
|
|
|
/* we need to manually tell that the resource exists, because we are using it as library. */
|
|
|
|
Q_INIT_RESOURCE(subsurface);
|
2021-07-21 20:32:28 +00:00
|
|
|
copy_prefs(&default_prefs, &prefs);
|
2016-12-27 12:31:30 +00:00
|
|
|
}
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
void TestParse::init()
|
|
|
|
{
|
|
|
|
_sqlite3_handle = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void TestParse::cleanup()
|
|
|
|
{
|
|
|
|
clear_dive_file_data();
|
|
|
|
|
|
|
|
// Some test use sqlite3, ensure db is closed
|
|
|
|
sqlite3_close(_sqlite3_handle);
|
|
|
|
}
|
|
|
|
|
2017-03-13 19:53:44 +00:00
|
|
|
int TestParse::parseCSV(int units, std::string file)
|
2015-03-10 21:27:14 +00:00
|
|
|
{
|
|
|
|
// some basic file parsing tests
|
|
|
|
//
|
2015-06-16 19:52:39 +00:00
|
|
|
// CSV import should work
|
2015-03-10 21:27:14 +00:00
|
|
|
verbose = 1;
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params params;
|
|
|
|
|
|
|
|
xml_params_add_int(¶ms, "numberField", 0);
|
|
|
|
xml_params_add_int(¶ms, "dateField", 1);
|
|
|
|
xml_params_add_int(¶ms, "timeField", 2);
|
|
|
|
xml_params_add_int(¶ms, "durationField", 3);
|
|
|
|
xml_params_add_int(¶ms, "locationField", -1);
|
|
|
|
xml_params_add_int(¶ms, "gpsField", -1);
|
|
|
|
xml_params_add_int(¶ms, "maxDepthField", 4);
|
|
|
|
xml_params_add_int(¶ms, "meanDepthField", 5);
|
|
|
|
xml_params_add_int(¶ms, "divemasterField", -1);
|
|
|
|
xml_params_add_int(¶ms, "buddyField", 6);
|
|
|
|
xml_params_add_int(¶ms, "suitField", 7);
|
|
|
|
xml_params_add_int(¶ms, "notesField", -1);
|
|
|
|
xml_params_add_int(¶ms, "weightField", -1);
|
|
|
|
xml_params_add_int(¶ms, "tagsField", -1);
|
|
|
|
xml_params_add_int(¶ms, "separatorIndex", 0);
|
|
|
|
xml_params_add_int(¶ms, "units", units);
|
|
|
|
xml_params_add_int(¶ms, "datefmt", 1);
|
|
|
|
xml_params_add_int(¶ms, "durationfmt", 2);
|
|
|
|
xml_params_add_int(¶ms, "cylindersizeField", -1);
|
|
|
|
xml_params_add_int(¶ms, "startpressureField", -1);
|
|
|
|
xml_params_add_int(¶ms, "endpressureField", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "heField", -1);
|
|
|
|
xml_params_add_int(¶ms, "airtempField", -1);
|
|
|
|
xml_params_add_int(¶ms, "watertempField", -1);
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
return parse_manual_file(file.c_str(), ¶ms, &divelog);
|
2015-03-10 21:27:14 +00:00
|
|
|
}
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
int TestParse::parseDivingLog()
|
2015-07-24 16:53:22 +00:00
|
|
|
{
|
|
|
|
// Parsing of DivingLog import from SQLite database
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
struct dive_site *ds = alloc_or_get_dive_site(0xdeadbeef, divelog.sites);
|
2015-07-24 16:53:22 +00:00
|
|
|
ds->name = copy_string("Suomi - - Hälvälä");
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
int ret = sqlite3_open(SUBSURFACE_TEST_DATA "/dives/TestDivingLog4.1.1.sql", &_sqlite3_handle);
|
2018-07-25 19:39:04 +00:00
|
|
|
if (ret == 0)
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
ret = parse_divinglog_buffer(_sqlite3_handle, 0, 0, 0, &divelog);
|
2017-03-04 15:06:52 +00:00
|
|
|
else
|
|
|
|
fprintf(stderr, "Can't open sqlite3 db: " SUBSURFACE_TEST_DATA "/dives/TestDivingLog4.1.1.sql");
|
2015-07-24 16:53:22 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
return ret;
|
2015-07-24 16:53:22 +00:00
|
|
|
}
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
int TestParse::parseV2NoQuestion()
|
2015-03-10 21:27:14 +00:00
|
|
|
{
|
2015-06-16 19:52:39 +00:00
|
|
|
// parsing of a V2 file should work
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
return parse_file(SUBSURFACE_TEST_DATA "/dives/test40.xml", &divelog);
|
2015-03-10 21:27:14 +00:00
|
|
|
}
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
int TestParse::parseV3()
|
2015-03-10 21:27:14 +00:00
|
|
|
{
|
2015-06-16 19:52:39 +00:00
|
|
|
// parsing of a V3 files should succeed
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
return parse_file(SUBSURFACE_TEST_DATA "/dives/test42.xml", &divelog);
|
2015-03-10 21:27:14 +00:00
|
|
|
}
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
void TestParse::testParse()
|
2015-03-10 21:27:14 +00:00
|
|
|
{
|
2017-03-13 19:53:44 +00:00
|
|
|
QCOMPARE(parseCSV(0, SUBSURFACE_TEST_DATA "/dives/test41.csv"), 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
fprintf(stderr, "number of dives %d \n", divelog.dives->nr);
|
2017-05-27 14:21:37 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
QCOMPARE(parseDivingLog(), 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
fprintf(stderr, "number of dives %d \n", divelog.dives->nr);
|
2015-07-26 12:08:11 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
QCOMPARE(parseV2NoQuestion(), 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
fprintf(stderr, "number of dives %d \n", divelog.dives->nr);
|
2015-07-26 12:08:11 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
QCOMPARE(parseV3(), 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
fprintf(stderr, "number of dives %d \n", divelog.dives->nr);
|
2015-07-26 12:08:11 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
QCOMPARE(save_dives("./testout.ssrf"), 0);
|
|
|
|
FILE_COMPARE("./testout.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/test40-42.xml");
|
2015-07-26 12:08:11 +00:00
|
|
|
}
|
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
void TestParse::testParseDM4()
|
2015-07-26 12:08:11 +00:00
|
|
|
{
|
2017-03-04 15:06:52 +00:00
|
|
|
QCOMPARE(sqlite3_open(SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.db", &_sqlite3_handle), 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QCOMPARE(parse_dm4_buffer(_sqlite3_handle, 0, 0, 0, &divelog), 0);
|
2017-05-27 14:21:37 +00:00
|
|
|
|
2015-07-26 12:08:11 +00:00
|
|
|
QCOMPARE(save_dives("./testdm4out.ssrf"), 0);
|
2017-03-04 15:06:52 +00:00
|
|
|
FILE_COMPARE("./testdm4out.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.xml");
|
2015-03-10 21:27:14 +00:00
|
|
|
}
|
|
|
|
|
2017-11-26 08:48:03 +00:00
|
|
|
void TestParse::testParseDM5()
|
|
|
|
{
|
|
|
|
QCOMPARE(sqlite3_open(SUBSURFACE_TEST_DATA "/dives/TestDiveDM5.db", &_sqlite3_handle), 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QCOMPARE(parse_dm5_buffer(_sqlite3_handle, 0, 0, 0, &divelog), 0);
|
2017-11-26 08:48:03 +00:00
|
|
|
|
|
|
|
QCOMPARE(save_dives("./testdm5out.ssrf"), 0);
|
|
|
|
FILE_COMPARE("./testdm5out.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/TestDiveDM5.xml");
|
2017-11-26 08:48:03 +00:00
|
|
|
}
|
|
|
|
|
2015-07-27 13:13:33 +00:00
|
|
|
void TestParse::testParseHUDC()
|
|
|
|
{
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params params;
|
|
|
|
|
|
|
|
xml_params_add_int(¶ms, "timeField", 0);
|
|
|
|
xml_params_add_int(¶ms, "depthField", 1);
|
|
|
|
xml_params_add_int(¶ms, "tempField", 5);
|
|
|
|
xml_params_add_int(¶ms, "po2Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2sensor1Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2sensor2Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2sensor3Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "cnsField", -1);
|
|
|
|
xml_params_add_int(¶ms, "ndlField", 2);
|
|
|
|
xml_params_add_int(¶ms, "ttsField", -1);
|
|
|
|
xml_params_add_int(¶ms, "stopdepthField", -1);
|
|
|
|
xml_params_add_int(¶ms, "pressureField", -1);
|
|
|
|
xml_params_add_int(¶ms, "setpointField", -1);
|
|
|
|
xml_params_add_int(¶ms, "separatorIndex", 2);
|
|
|
|
xml_params_add_int(¶ms, "units", 0);
|
|
|
|
xml_params_add(¶ms, "hw", "\"DC text\"");
|
2015-08-27 14:36:24 +00:00
|
|
|
|
2017-02-24 06:52:07 +00:00
|
|
|
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearHUDC.csv",
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
¶ms, "csv", &divelog),
|
2018-07-25 19:39:04 +00:00
|
|
|
0);
|
2015-07-27 13:13:33 +00:00
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QCOMPARE(divelog.dives->nr, 1);
|
2017-02-06 00:11:20 +00:00
|
|
|
|
2015-07-27 13:13:33 +00:00
|
|
|
/*
|
|
|
|
* CSV import uses time and date stamps relative to current
|
|
|
|
* time, thus we need to use a static (random) timestamp
|
|
|
|
*/
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (divelog.dives->nr > 0) {
|
|
|
|
struct dive *dive = divelog.dives->dives[divelog.dives->nr - 1];
|
2017-02-06 12:49:24 +00:00
|
|
|
dive->when = 1255152761;
|
|
|
|
dive->dc.when = 1255152761;
|
|
|
|
}
|
2015-07-27 13:13:33 +00:00
|
|
|
|
|
|
|
QCOMPARE(save_dives("./testhudcout.ssrf"), 0);
|
2017-03-04 15:06:52 +00:00
|
|
|
FILE_COMPARE("./testhudcout.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearHUDC.xml");
|
2015-07-27 13:13:33 +00:00
|
|
|
}
|
|
|
|
|
2015-07-28 04:36:30 +00:00
|
|
|
void TestParse::testParseNewFormat()
|
|
|
|
{
|
|
|
|
QDir dir;
|
|
|
|
QStringList filter;
|
|
|
|
QStringList files;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the directory location and file filter for H3 CSV files.
|
|
|
|
*/
|
|
|
|
|
2020-01-06 20:51:10 +00:00
|
|
|
dir.setPath(QString::fromLatin1(SUBSURFACE_TEST_DATA "/dives"));
|
2015-07-28 04:36:30 +00:00
|
|
|
filter << "TestDiveSeabearH3*.csv";
|
|
|
|
filter << "TestDiveSeabearT1*.csv";
|
|
|
|
files = dir.entryList(filter, QDir::Files);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse all files found matching the filter.
|
|
|
|
*/
|
|
|
|
|
|
|
|
for (int i = 0; i < files.size(); ++i) {
|
|
|
|
|
2017-05-07 13:32:11 +00:00
|
|
|
QCOMPARE(parse_seabear_log(QString::fromLatin1(SUBSURFACE_TEST_DATA
|
2018-07-25 19:39:04 +00:00
|
|
|
"/dives/")
|
|
|
|
.append(files.at(i))
|
|
|
|
.toLatin1()
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
.data(), &divelog),
|
2018-07-25 19:39:04 +00:00
|
|
|
0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QCOMPARE(divelog.dives->nr, i + 1);
|
2015-07-28 04:36:30 +00:00
|
|
|
}
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
fprintf(stderr, "number of dives %d \n", divelog.dives->nr);
|
2015-07-28 04:36:30 +00:00
|
|
|
QCOMPARE(save_dives("./testsbnewout.ssrf"), 0);
|
2017-02-07 06:08:56 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
// Currently the CSV parse fails
|
|
|
|
FILE_COMPARE("./testsbnewout.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearNewFormat.xml");
|
2015-07-28 04:36:30 +00:00
|
|
|
}
|
|
|
|
|
2015-09-13 18:30:25 +00:00
|
|
|
void TestParse::testParseDLD()
|
|
|
|
{
|
|
|
|
struct memblock mem;
|
2017-02-24 06:52:07 +00:00
|
|
|
QString filename = SUBSURFACE_TEST_DATA "/dives/TestDiveDivelogsDE.DLD";
|
2015-09-13 18:30:25 +00:00
|
|
|
|
|
|
|
QVERIFY(readfile(filename.toLatin1().data(), &mem) > 0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QVERIFY(try_to_open_zip(filename.toLatin1().data(), &divelog) > 0);
|
2015-09-13 18:30:25 +00:00
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
fprintf(stderr, "number of dives from DLD: %d \n", divelog.dives->nr);
|
2015-09-13 18:30:25 +00:00
|
|
|
|
2017-03-04 15:06:52 +00:00
|
|
|
// Compare output
|
2015-09-13 18:30:27 +00:00
|
|
|
QCOMPARE(save_dives("./testdldout.ssrf"), 0);
|
2017-03-04 15:06:52 +00:00
|
|
|
FILE_COMPARE("./testdldout.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/TestDiveDivelogsDE.xml")
|
2015-09-13 18:30:27 +00:00
|
|
|
}
|
|
|
|
|
2017-02-10 06:16:08 +00:00
|
|
|
void TestParse::testParseMerge()
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* check that we correctly merge mixed cylinder dives
|
|
|
|
*/
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/ostc.xml", &divelog), 0);
|
|
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/vyper.xml", &divelog), 0);
|
2017-02-10 06:16:08 +00:00
|
|
|
QCOMPARE(save_dives("./testmerge.ssrf"), 0);
|
2017-03-04 15:06:52 +00:00
|
|
|
FILE_COMPARE("./testmerge.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/mergedVyperOstc.xml");
|
2017-02-10 06:16:08 +00:00
|
|
|
}
|
|
|
|
|
2017-03-14 04:58:59 +00:00
|
|
|
int TestParse::parseCSVmanual(int units, std::string file)
|
|
|
|
{
|
|
|
|
verbose = 1;
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params params;
|
2017-03-14 04:58:59 +00:00
|
|
|
|
2018-03-14 20:38:38 +00:00
|
|
|
// Numbers are column numbers
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params_add_int(¶ms, "numberField", 0);
|
|
|
|
xml_params_add_int(¶ms, "dateField", 1);
|
|
|
|
xml_params_add_int(¶ms, "timeField", 2);
|
|
|
|
xml_params_add_int(¶ms, "durationField", 3);
|
2020-05-16 10:04:18 +00:00
|
|
|
// 4 Will be SAC, once we add support for reading it
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params_add_int(¶ms, "maxDepthField", 5);
|
|
|
|
xml_params_add_int(¶ms, "meanDepthField", 6);
|
|
|
|
xml_params_add_int(¶ms, "modeField", 7);
|
|
|
|
xml_params_add_int(¶ms, "airtempField", 8);
|
|
|
|
xml_params_add_int(¶ms, "watertempField", 9);
|
|
|
|
xml_params_add_int(¶ms, "cylindersizeField", 10);
|
|
|
|
xml_params_add_int(¶ms, "startpressureField", 11);
|
|
|
|
xml_params_add_int(¶ms, "endpressureField", 12);
|
|
|
|
xml_params_add_int(¶ms, "o2Field", 13);
|
|
|
|
xml_params_add_int(¶ms, "heField", 14);
|
|
|
|
xml_params_add_int(¶ms, "locationField", 15);
|
|
|
|
xml_params_add_int(¶ms, "gpsField", 16);
|
|
|
|
xml_params_add_int(¶ms, "divemasterField", 17);
|
|
|
|
xml_params_add_int(¶ms, "buddyField", 18);
|
|
|
|
xml_params_add_int(¶ms, "suitField", 19);
|
|
|
|
xml_params_add_int(¶ms, "notesField", 22);
|
|
|
|
xml_params_add_int(¶ms, "weightField", 23);
|
|
|
|
xml_params_add_int(¶ms, "tagsField", 24);
|
2020-03-11 10:30:51 +00:00
|
|
|
// Numbers are indices of possible options
|
2023-04-28 04:10:41 +00:00
|
|
|
xml_params_add_int(¶ms, "separatorIndex", 1);
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params_add_int(¶ms, "datefmt", 2);
|
|
|
|
xml_params_add_int(¶ms, "durationfmt", 2);
|
|
|
|
xml_params_add_int(¶ms, "units", units);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
return parse_manual_file(file.c_str(), ¶ms, &divelog);
|
2017-03-14 04:58:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void TestParse::exportCSVDiveDetails()
|
|
|
|
{
|
2020-05-21 14:57:24 +00:00
|
|
|
int saved_sac = 0;
|
2020-05-17 19:10:40 +00:00
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
parse_file(SUBSURFACE_TEST_DATA "/dives/test25.xml", &divelog);
|
2017-03-14 04:58:59 +00:00
|
|
|
|
2018-09-10 12:47:56 +00:00
|
|
|
export_dives_xslt("testcsvexportmanual.csv", 0, 0, "xml2manualcsv.xslt", false);
|
|
|
|
export_dives_xslt("testcsvexportmanualimperial.csv", 0, 1, "xml2manualcsv.xslt", false);
|
2017-03-14 04:58:59 +00:00
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (divelog.dives->nr > 0) {
|
|
|
|
struct dive *dive = divelog.dives->dives[divelog.dives->nr - 1];
|
2020-05-17 19:10:40 +00:00
|
|
|
saved_sac = dive->sac;
|
|
|
|
}
|
2017-03-14 04:58:59 +00:00
|
|
|
clear_dive_file_data();
|
|
|
|
|
|
|
|
parseCSVmanual(1, "testcsvexportmanualimperial.csv");
|
2020-05-16 10:04:18 +00:00
|
|
|
|
|
|
|
// We do not currently support reading SAC, thus faking it
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (divelog.dives->nr > 0) {
|
|
|
|
struct dive *dive = divelog.dives->dives[divelog.dives->nr - 1];
|
2020-05-17 19:10:40 +00:00
|
|
|
dive->sac = saved_sac;
|
2020-05-16 10:04:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-09-10 12:47:56 +00:00
|
|
|
export_dives_xslt("testcsvexportmanual2.csv", 0, 0, "xml2manualcsv.xslt", false);
|
2017-03-14 04:58:59 +00:00
|
|
|
|
|
|
|
FILE_COMPARE("testcsvexportmanual2.csv",
|
2018-07-25 19:39:04 +00:00
|
|
|
"testcsvexportmanual.csv");
|
2017-03-29 17:33:52 +00:00
|
|
|
|
|
|
|
clear_dive_file_data();
|
2017-03-14 04:58:59 +00:00
|
|
|
}
|
|
|
|
|
2020-05-24 13:50:56 +00:00
|
|
|
void TestParse::exportSubsurfaceCSV()
|
|
|
|
{
|
|
|
|
int saved_sac = 0;
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params params;
|
2020-05-24 13:50:56 +00:00
|
|
|
|
|
|
|
/* Test SubsurfaceCSV with multiple cylinders */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
parse_file(SUBSURFACE_TEST_DATA "/dives/test40.xml", &divelog);
|
2020-05-24 13:50:56 +00:00
|
|
|
|
|
|
|
export_dives_xslt("testcsvexportmanual-cyl.csv", 0, 0, "xml2manualcsv.xslt", false);
|
|
|
|
export_dives_xslt("testcsvexportmanualimperial-cyl.csv", 0, 1, "xml2manualcsv.xslt", false);
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (divelog.dives->nr > 0) {
|
|
|
|
struct dive *dive = divelog.dives->dives[divelog.dives->nr - 1];
|
2020-05-24 13:50:56 +00:00
|
|
|
saved_sac = dive->sac;
|
|
|
|
}
|
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
|
2023-04-28 04:10:41 +00:00
|
|
|
xml_params_add_int(¶ms, "separatorIndex", 1);
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params_add_int(¶ms, "units", 1);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
parse_csv_file("testcsvexportmanualimperial-cyl.csv", ¶ms, "SubsurfaceCSV", &divelog);
|
2020-05-24 13:50:56 +00:00
|
|
|
|
|
|
|
// We do not currently support reading SAC, thus faking it
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (divelog.dives->nr > 0) {
|
|
|
|
struct dive *dive = divelog.dives->dives[divelog.dives->nr - 1];
|
2020-05-24 13:50:56 +00:00
|
|
|
dive->sac = saved_sac;
|
|
|
|
}
|
|
|
|
|
|
|
|
export_dives_xslt("testcsvexportmanual2-cyl.csv", 0, 0, "xml2manualcsv.xslt", false);
|
|
|
|
|
|
|
|
FILE_COMPARE("testcsvexportmanual2-cyl.csv",
|
|
|
|
"testcsvexportmanual-cyl.csv");
|
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
}
|
|
|
|
|
2017-05-09 19:28:04 +00:00
|
|
|
int TestParse::parseCSVprofile(int units, std::string file)
|
|
|
|
{
|
|
|
|
verbose = 1;
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params params;
|
2017-05-09 19:28:04 +00:00
|
|
|
|
2018-03-14 20:38:38 +00:00
|
|
|
// Numbers are column numbers
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params_add_int(¶ms, "numberField", 0);
|
|
|
|
xml_params_add_int(¶ms, "dateField", 1);
|
|
|
|
xml_params_add_int(¶ms, "starttimeField", 2);
|
|
|
|
xml_params_add_int(¶ms, "timeField", 3);
|
|
|
|
xml_params_add_int(¶ms, "depthField", 4);
|
|
|
|
xml_params_add_int(¶ms, "tempField", 5);
|
|
|
|
xml_params_add_int(¶ms, "pressureField", 6);
|
2020-03-11 10:30:51 +00:00
|
|
|
// Numbers are indices of possible options
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params_add_int(¶ms, "datefmt", 2);
|
|
|
|
xml_params_add_int(¶ms, "units", units);
|
2017-05-09 19:28:04 +00:00
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
return parse_csv_file(file.c_str(), ¶ms, "csv", &divelog);
|
2017-05-09 19:28:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void TestParse::exportCSVDiveProfile()
|
|
|
|
{
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
parse_file(SUBSURFACE_TEST_DATA "/dives/test40.xml", &divelog);
|
2017-05-09 19:28:04 +00:00
|
|
|
|
2018-09-10 12:47:56 +00:00
|
|
|
export_dives_xslt("testcsvexportprofile.csv", 0, 0, "xml2csv.xslt", false);
|
|
|
|
export_dives_xslt("testcsvexportprofileimperial.csv", 0, 1, "xml2csv.xslt", false);
|
2017-05-09 19:28:04 +00:00
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
|
|
|
|
parseCSVprofile(1, "testcsvexportprofileimperial.csv");
|
2018-09-10 12:47:56 +00:00
|
|
|
export_dives_xslt("testcsvexportprofile2.csv", 0, 0, "xml2csv.xslt", false);
|
2017-05-09 19:28:04 +00:00
|
|
|
|
|
|
|
FILE_COMPARE("testcsvexportprofile2.csv",
|
2018-07-25 19:39:04 +00:00
|
|
|
"testcsvexportprofile.csv");
|
2017-05-09 19:28:04 +00:00
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
}
|
|
|
|
|
2017-05-04 19:10:35 +00:00
|
|
|
void TestParse::exportUDDF()
|
|
|
|
{
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
parse_file(SUBSURFACE_TEST_DATA "/dives/test40.xml", &divelog);
|
2017-05-04 19:10:35 +00:00
|
|
|
|
2018-09-10 12:47:56 +00:00
|
|
|
export_dives_xslt("testuddfexport.uddf", 0, 1, "uddf-export.xslt", false);
|
2017-05-04 19:10:35 +00:00
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
parse_file("testuddfexport.uddf", &divelog);
|
2018-09-10 12:47:56 +00:00
|
|
|
export_dives_xslt("testuddfexport2.uddf", 0, 1, "uddf-export.xslt", false);
|
2017-05-04 19:10:35 +00:00
|
|
|
|
|
|
|
FILE_COMPARE("testuddfexport.uddf",
|
2018-07-25 19:39:04 +00:00
|
|
|
"testuddfexport2.uddf");
|
2017-05-04 19:10:35 +00:00
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
}
|
|
|
|
|
2017-03-14 04:58:59 +00:00
|
|
|
void TestParse::testExport()
|
|
|
|
{
|
|
|
|
exportCSVDiveDetails();
|
2020-05-24 13:50:56 +00:00
|
|
|
exportSubsurfaceCSV();
|
2017-05-09 19:28:04 +00:00
|
|
|
exportCSVDiveProfile();
|
2017-05-04 19:10:35 +00:00
|
|
|
exportUDDF();
|
2017-03-14 04:58:59 +00:00
|
|
|
}
|
|
|
|
|
2018-01-06 19:16:53 +00:00
|
|
|
void TestParse::parseDL7()
|
|
|
|
{
|
2020-10-17 18:15:23 +00:00
|
|
|
xml_params params;
|
|
|
|
|
|
|
|
xml_params_add_int(¶ms, "dateField", -1);
|
|
|
|
xml_params_add_int(¶ms, "datefmt", 0);
|
|
|
|
xml_params_add_int(¶ms, "starttimeField", -1);
|
|
|
|
xml_params_add_int(¶ms, "numberField", -1);
|
|
|
|
xml_params_add_int(¶ms, "timeField", 1);
|
|
|
|
xml_params_add_int(¶ms, "depthField", 2);
|
|
|
|
xml_params_add_int(¶ms, "tempField", -1);
|
|
|
|
xml_params_add_int(¶ms, "po2Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2sensor1Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2sensor2Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "o2sensor3Field", -1);
|
|
|
|
xml_params_add_int(¶ms, "cnsField", -1);
|
|
|
|
xml_params_add_int(¶ms, "ndlField", -1);
|
|
|
|
xml_params_add_int(¶ms, "ttsField", -1);
|
|
|
|
xml_params_add_int(¶ms, "stopdepthField", -1);
|
|
|
|
xml_params_add_int(¶ms, "pressureField", -1);
|
|
|
|
xml_params_add_int(¶ms, "setpointField", -1);
|
|
|
|
xml_params_add_int(¶ms, "separatorIndex", 3);
|
|
|
|
xml_params_add_int(¶ms, "units", 0);
|
|
|
|
xml_params_add(¶ms, "hw", "DL7");
|
2018-01-06 19:16:53 +00:00
|
|
|
|
|
|
|
clear_dive_file_data();
|
|
|
|
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/DL7.zxu",
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
¶ms, "DL7", &divelog),
|
2018-07-25 19:39:04 +00:00
|
|
|
0);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
QCOMPARE(divelog.dives->nr, 3);
|
2018-01-06 19:16:53 +00:00
|
|
|
|
2018-01-06 21:09:34 +00:00
|
|
|
QCOMPARE(save_dives("./testdl7out.ssrf"), 0);
|
|
|
|
FILE_COMPARE("./testdl7out.ssrf",
|
2018-07-25 19:39:04 +00:00
|
|
|
SUBSURFACE_TEST_DATA "/dives/DL7.xml");
|
2018-01-06 19:16:53 +00:00
|
|
|
clear_dive_file_data();
|
|
|
|
}
|
|
|
|
|
2017-03-14 04:58:59 +00:00
|
|
|
|
2017-02-05 22:26:51 +00:00
|
|
|
QTEST_GUILESS_MAIN(TestParse)
|