diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-05 09:39:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-05 09:48:11 -0700 |
| commit | 04c98344b3c50b58dcc62eeb6d13e11030eb662d (patch) | |
| tree | 1eb1da977bf2d97a39673012e0f83a8a818d8154 /parse-xml.c | |
| parent | 5f79a804b925a8ffbcf933bb6fae4f764b518c8e (diff) | |
| download | subsurface-04c98344b3c50b58dcc62eeb6d13e11030eb662d.tar.gz | |
Turn dive depth, temperature and duration into xml attributes
This makes the xml save-file look way nicer: it's both smaller and
better organized. Using individual xml nodes for random small details
is silly.
The duration even parses exactly the same, because it still ends up
being '.depth.duration' (now it's the 'duration' attribute of the dive
node, it used to be the 'duration' child node of the dive node).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/parse-xml.c b/parse-xml.c index f68aae67e..393ee0061 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -633,6 +633,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf) return; if (MATCH(".meandepth", depth, &dive->meandepth)) return; + if (MATCH(".depth.max", depth, &dive->maxdepth)) + return; + if (MATCH(".depth.mean", depth, &dive->meandepth)) + return; if (MATCH(".duration", duration, &dive->duration)) return; if (MATCH(".divetime", duration, &dive->duration)) @@ -645,6 +649,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf) return; if (MATCH(".watertemp", temperature, &dive->watertemp)) return; + if (MATCH(".temperature.air", temperature, &dive->airtemp)) + return; + if (MATCH(".temperature.water", temperature, &dive->watertemp)) + return; if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start)) return; if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end)) |