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

Parse water temperature from ZDT

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2018-01-07 15:51:28 +02:00 • committed by mturkia
parent 5e9e6625d0
commit 6a2ea71a36
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/import-csv.c
View file

@ -169,6 +169,23 @@ int parse_dan_format(const char *filename, char **params, int pnr)
/* We got a trailer, no samples on this dive */ /* We got a trailer, no samples on this dive */
if (strncmp(iter, "ZDT", 3) == 0) { if (strncmp(iter, "ZDT", 3) == 0) {
end_ptr = iter - (char *)mem.buffer; end_ptr = iter - (char *)mem.buffer;
/* Water temperature */
memset(tmpbuf, 0, sizeof(tmpbuf));
for (i = 0; i < 5 && iter; ++i)
iter = strchr(iter + 1, '|');
if (iter && iter + 1) {
iter = iter + 1;
iter_end = strchr(iter, '|');
if (iter_end) {
memcpy(tmpbuf, iter, iter_end - iter);
params[pnr_local++] = "waterTemp";
params[pnr_local++] = strdup(tmpbuf);
}
}
params[pnr_local] = NULL;
ret |= parse_xml_buffer(filename, "<csv></csv>", 11, &dive_table, (const char **)params); ret |= parse_xml_buffer(filename, "<csv></csv>", 11, &dive_table, (const char **)params);
continue; continue;
} }
@ -204,6 +221,26 @@ int parse_dan_format(const char *filename, char **params, int pnr)
} }
mem_csv.size = ptr - (char*)mem_csv.buffer; mem_csv.size = ptr - (char*)mem_csv.buffer;
iter = parse_dan_new_line(ptr + 1, NL);
if (iter && strncmp(iter, "ZDT", 3) == 0) {
/* Water temperature */
memset(tmpbuf, 0, sizeof(tmpbuf));
for (i = 0; i < 5 && iter; ++i)
iter = strchr(iter + 1, '|');
if (iter && iter + 1) {
iter = iter + 1;
iter_end = strchr(iter, '|');
if (iter_end) {
memcpy(tmpbuf, iter, iter_end - iter);
params[pnr_local++] = "waterTemp";
params[pnr_local++] = strdup(tmpbuf);
}
}
params[pnr_local] = NULL;
}
if (try_to_xslt_open_csv(filename, &mem_csv, "csv")) if (try_to_xslt_open_csv(filename, &mem_csv, "csv"))
return -1; return -1;