diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-04 14:29:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-04 14:56:01 -0700 |
| commit | e58fa7b9b506d5bb30268060279bc8dcbbeb99ea (patch) | |
| tree | ea16fc6e563c1b802435430c6e0c67d3b0f5ee5f /parse-xml.c | |
| parent | e007e7005316f7ce5c54dcb84d0ea7cbd30635de (diff) | |
| download | subsurface-e58fa7b9b506d5bb30268060279bc8dcbbeb99ea.tar.gz | |
Parse uemis cylinder data
This is some seriously crazy stuff. Instead of making sense as a
divelog, the uemis xml makes more sense as a "dive computer settings
dump".
And I guess I can see why they'd do that. But it makes parsing it just
incredibly annoying. The thing is more of a "these are the
configurations I support as a dive computer thing" than a "this was the
tank you were diving with".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/parse-xml.c b/parse-xml.c index 1ca046db7..75959d682 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -587,6 +587,7 @@ static void uemis_time_zone(char *buffer, void *_when) *when += tz * 3600; } +/* Christ. Uemis tank data is a total mess. */ static int uemis_dive_match(struct dive *dive, const char *name, int len, char *buf) { return MATCH(".units.length", uemis_length_unit, &units) || @@ -599,6 +600,20 @@ static int uemis_dive_match(struct dive *dive, const char *name, int len, char * MATCH(".date_time", uemis_date_time, &dive->when) || MATCH(".time_zone", uemis_time_zone, &dive->when) || MATCH(".ambient.temperature", decicelsius, &dive->airtemp) || + MATCH(".air.bottom_tank.size", cylindersize, &dive->cylinder[0].type.size) || + MATCH(".air.bottom_tank.oxygen", percent, &dive->cylinder[0].gasmix.o2) || + MATCH(".nitrox_1.bottom_tank.size", cylindersize, &dive->cylinder[1].type.size) || + MATCH(".nitrox_1.bottom_tank.oxygen", percent, &dive->cylinder[1].gasmix.o2) || + MATCH(".nitrox_2.bottom_tank.size", cylindersize, &dive->cylinder[2].type.size) || + MATCH(".nitrox_2.bottom_tank.oxygen", percent, &dive->cylinder[2].gasmix.o2) || + MATCH(".nitrox_2.deco_tank.size", cylindersize, &dive->cylinder[3].type.size) || + MATCH(".nitrox_2.deco_tank.oxygen", percent, &dive->cylinder[3].gasmix.o2) || + MATCH(".nitrox_3.bottom_tank.size", cylindersize, &dive->cylinder[4].type.size) || + MATCH(".nitrox_3.bottom_tank.oxygen", percent, &dive->cylinder[4].gasmix.o2) || + MATCH(".nitrox_3.deco_tank.size", cylindersize, &dive->cylinder[5].type.size) || + MATCH(".nitrox_3.deco_tank.oxygen", percent, &dive->cylinder[5].gasmix.o2) || + MATCH(".nitrox_3.travel_tank.size", cylindersize, &dive->cylinder[6].type.size) || + MATCH(".nitrox_3.travel_tank.oxygen", percent, &dive->cylinder[6].gasmix.o2) || 0; } |