diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2014-12-31 18:27:30 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-31 08:35:30 -0800 |
| commit | 65ee482adb08a46fbda57d067524df270ca5a121 (patch) | |
| tree | 4c2b7f8fb5fccc1ca10393c1b9c2c23a31be8fb2 /file.c | |
| parent | a46cebd1adc0e3b7a9c37d39c961495dd3cc0f79 (diff) | |
| download | subsurface-65ee482adb08a46fbda57d067524df270ca5a121.tar.gz | |
Add duration format to XSLT call
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -969,11 +969,11 @@ int parse_seabear_csv_file(const char *filename, int timef, int depthf, int temp return ret; } -int parse_manual_file(const char *filename, int sepidx, int units, int dateformat, int numberf, int datef, int timef, int durationf, int locationf, int gpsf, int maxdepthf, int meandepthf, int buddyf, int notesf, int weightf, int tagsf, int cylsizef, int startpresf, int endpresf, int o2f, int hef, int airtempf, int watertempf) +int parse_manual_file(const char *filename, int sepidx, int units, int dateformat, int durationformat, int numberf, int datef, int timef, int durationf, int locationf, int gpsf, int maxdepthf, int meandepthf, int buddyf, int notesf, int weightf, int tagsf, int cylsizef, int startpresf, int endpresf, int o2f, int hef, int airtempf, int watertempf) { struct memblock mem; int pnr = 0; - char *params[49]; + char *params[51]; char numberbuf[MAXCOLDIGITS]; char datebuf[MAXCOLDIGITS]; char timebuf[MAXCOLDIGITS]; @@ -989,6 +989,7 @@ int parse_manual_file(const char *filename, int sepidx, int units, int dateforma char separator_index[MAXCOLDIGITS]; char unit[MAXCOLDIGITS]; char datefmt[MAXCOLDIGITS]; + char durationfmt[MAXCOLDIGITS]; char cylsizebuf[MAXCOLDIGITS]; char startpresbuf[MAXCOLDIGITS]; char endpresbuf[MAXCOLDIGITS]; @@ -1020,6 +1021,7 @@ int parse_manual_file(const char *filename, int sepidx, int units, int dateforma snprintf(separator_index, MAXCOLDIGITS, "%d", sepidx); snprintf(unit, MAXCOLDIGITS, "%d", units); snprintf(datefmt, MAXCOLDIGITS, "%d", dateformat); + snprintf(durationfmt, MAXCOLDIGITS, "%d", durationformat); snprintf(cylsizebuf, MAXCOLDIGITS, "%d", cylsizef); snprintf(startpresbuf, MAXCOLDIGITS, "%d", startpresf); snprintf(endpresbuf, MAXCOLDIGITS, "%d", endpresf); @@ -1069,6 +1071,8 @@ int parse_manual_file(const char *filename, int sepidx, int units, int dateforma params[pnr++] = unit; params[pnr++] = "datefmt"; params[pnr++] = datefmt; + params[pnr++] = "durationfmt"; + params[pnr++] = durationfmt; params[pnr++] = "cylindersizeField"; params[pnr++] = cylsizebuf; params[pnr++] = "startpressureField"; |