diff options
| author |  Salvador Cuñat <salvador.cunat@gmail.com> | 2015-10-04 11:17:25 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-04 12:35:51 +0100 |
| commit | b26e516e2aff961a4c7d73cbfae0d202b12d11dc (patch) | |
| tree | a11ac71c28c23151061732d3776cba59efd20eee | |
| parent | bdaa4eb8b03fabda842a9797553bacf5a466ddb0 (diff) | |
| download | subsurface-b26e516e2aff.tar.gz | |
Dive_sites-Notes shouldn't be stored as attribute
If so, some formatting chars (like "\n") will be dropped while parsing.
This could be pretty annoying for a user who tries to keep notes other
than a simple text, e.g. if the site is a wreck, may be interesting to
have some data shown like:
...
Max. Depth = 60 m
Min. Depth = 40 m
Prow: bla, bla, bla.
Stern: bla, bla, bla.
...
instead of a single text line.
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
ACKed-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | save-xml.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/save-xml.c b/save-xml.c index 6d0284056..8aa5088af 100644 --- a/save-xml.c +++ b/save-xml.c @@ -550,21 +550,19 @@ void save_dives_buffer(struct membuffer *b, const bool select_only) put_degrees(b, ds->longitude, "", "'"); } show_utf8(b, ds->description, " description='", "'", 1); - show_utf8(b, ds->notes, " notes='", "'", 1); + put_format(b, ">\n"); + show_utf8(b, ds->notes, " <notes>", " </notes>\n", 0); if (ds->taxonomy.nr) { - put_format(b, ">\n"); for (int j = 0; j < ds->taxonomy.nr; j++) { struct taxonomy *t = &ds->taxonomy.category[j]; if (t->category != TC_NONE) { - put_format(b, "<geo cat='%d'", t->category); + put_format(b, " <geo cat='%d'", t->category); put_format(b, " origin='%d'", t->origin); show_utf8(b, t->value, " value='", "'/>\n", 1); } } - put_format(b, "</site>\n"); - } else { - put_format(b, "/>\n"); } + put_format(b, "</site>\n"); } put_format(b, "</divesites>\n<dives>\n"); for (trip = dive_trip_list; trip != NULL; trip = trip->next) |