From: Dirk Hohndel Date: Tue, 6 Sep 2011 01:08:16 +0000 (-0700) Subject: update UEMIS date_time parsing X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=98d556c6f69c63e8fd89b7a435f641fbdd836324;p=ext%2Fsubsurface.git update UEMIS date_time parsing Looks like Linus misinterpreted the first UEMIS xml files I sent him. The date_time appears to be in local time - so the time zone info can be ignored (that seems strange, but it worked for the dives I tested it with) Signed-off-by: Dirk Hohndel Signed-off-by: Linus Torvalds --- diff --git a/parse-xml.c b/parse-xml.c index 90fdb1a..36db7e7 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -648,7 +648,7 @@ static void uemis_date_time(char *buffer, void *_when) switch (integer_or_float(buffer, &val)) { case FLOAT: - *when = (val.fp - 40587.5) * 86400; + *when = (val.fp - 40587) * 86400; break; default: fprintf(stderr, "Strange julian date: %s", buffer); @@ -665,10 +665,14 @@ static void uemis_date_time(char *buffer, void *_when) */ static void uemis_time_zone(char *buffer, void *_when) { +#if 0 /* seems like this is only used to display it correctly + * the stored time appears to be UTC */ + time_t *when = _when; signed char tz = atoi(buffer); *when += tz * 3600; +#endif } /* 0 - air ; 1 - nitrox1 ; 2 - nitrox2 ; 3 = nitrox3 */