summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2016-04-24 21:11:23 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-04-25 12:32:10 -0700
commit6df8752d7d380f68e3fe84c81f62a56b0680ac75 (patch)
treea69bbd1bc57d704d574e1f281cef8a91e3556793
parent9d26f40279826ab81f5c4d95b4670b06ab172bca (diff)
downloadsubsurface-6df8752d7d380f68e3fe84c81f62a56b0680ac75.tar.gz
Grab the payload of DL7 file
This allows us to parse the DL7 profile data (skipping the header and footer) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--file.c37
1 files changed, 37 insertions, 0 deletions
diff --git a/file.c b/file.c
index 0263da457..e7a79ea2d 100644
--- a/file.c
+++ b/file.c
@@ -875,6 +875,43 @@ int parse_csv_file(const char *filename, char **params, int pnr, const char *csv
params[pnr++] = NULL;
mem.size = 0;
+
+ if (!strcmp("DL7", csvtemplate)) {
+ char *ptr = NULL;
+ char *NL = NULL;
+
+ csvtemplate = "csv";
+ if (readfile(filename, &mem) < 0)
+ return report_error(translate("gettextFromC", "Failed to read '%s'"), filename);
+
+ /* Determine NL (new line) character and the start of CSV data */
+ if ((ptr = strstr(mem.buffer, "\r\n")) != NULL) {
+ NL = "\r\n";
+ } else if ((ptr = strstr(mem.buffer, "\n")) != NULL) {
+ NL = "\n";
+ } else {
+ fprintf(stderr, "DEBUG: failed to detect NL\n");
+ return -1;
+ }
+
+ ptr = strstr(mem.buffer, "ZDP");
+ if (ptr)
+ ptr = strstr(ptr, NL);
+ if (ptr)
+ ptr + strlen(NL);
+
+ /* Move the CSV data to the start of mem buffer */
+ memmove(mem.buffer, ptr, mem.size - (ptr - (char*)mem.buffer));
+ ptr = strstr(mem.buffer, "ZDP");
+ if (ptr) {
+ *ptr = 0;
+ } else {
+ fprintf(stderr, "DEBUG: failed to find end ZDP\n");
+ return -1;
+ }
+ mem.size = ptr - (char*)mem.buffer;
+ }
+
if (try_to_xslt_open_csv(filename, &mem, csvtemplate))
return -1;