X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=save-xml.c;h=b797475e5362441b49bfe5cbf87a7a64d4259ae9;hp=c93a828cc54f8fa5b1c29eb28bf7b42762fe034e;hb=HEAD;hpb=b17c7f07095da886a688de2d36f79d433d6110b9 diff --git a/save-xml.c b/save-xml.c index c93a828..b797475 100644 --- a/save-xml.c +++ b/save-xml.c @@ -67,10 +67,9 @@ static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const c * characters, but at least libxml2 doesn't like them. It doesn't even * allow them quoted. So we just skip them and replace them with '?'. * - * Nothing else (and if we ever do this using attributes, we'd need to - * quote the quotes we use too). + * If we do this for attributes, we need to quote the quotes we use too. */ -static void quote(FILE *f, const char *text) +static void quote(FILE *f, const char *text, int is_attribute) { const char *p = text; @@ -97,6 +96,16 @@ static void quote(FILE *f, const char *text) case '&': escape = "&"; break; + case '\'': + if (!is_attribute) + continue; + escape = "'"; + break; + case '\"': + if (!is_attribute) + continue; + escape = """; + break; } fwrite(text, (p - text - 1), 1, f); if (!escape) @@ -106,7 +115,7 @@ static void quote(FILE *f, const char *text) } } -static void show_utf8(FILE *f, const char *text, const char *pre, const char *post) +static void show_utf8(FILE *f, const char *text, const char *pre, const char *post, int is_attribute) { int len; @@ -121,7 +130,7 @@ static void show_utf8(FILE *f, const char *text, const char *pre, const char *po len--; /* FIXME! Quoting! */ fputs(pre, f); - quote(f, text); + quote(f, text, is_attribute); fputs(post, f); } @@ -147,13 +156,43 @@ static void save_temperatures(FILE *f, struct dive *dive) fputs(" />\n", f); } +static void show_location(FILE *f, struct dive *dive) +{ + char buffer[80]; + const char *prefix = " "; + double latitude = dive->latitude; + double longitude = dive->longitude; + + /* + * Ok, theoretically I guess you could dive at + * exactly 0,0. But we don't support that. So + * if you do, just fudge it a bit, and say that + * you dove a few meters away. + */ + if (latitude || longitude) { + int len = snprintf(buffer, sizeof(buffer)-4, + " ", + latitude, longitude); + if (!dive->location) { + memcpy(&buffer[len-1], "/>\n", 4); + fputs(buffer, f); + return; + } + prefix = buffer; + } + show_utf8(f, dive->location, prefix,"\n", 0); +} + static void save_overview(FILE *f, struct dive *dive) { save_depths(f, dive); save_temperatures(f, dive); show_duration(f, dive->surfacetime, " ", "\n"); - show_utf8(f, dive->location, " ","\n"); - show_utf8(f, dive->notes, " ","\n"); + show_location(f, dive); + show_utf8(f, dive->divemaster, " ","\n", 0); + show_utf8(f, dive->buddy, " ","\n", 0); + show_utf8(f, dive->notes, " ","\n", 0); + show_utf8(f, dive->suit, " ","\n", 0); } static void save_cylinder_info(FILE *f, struct dive *dive) @@ -173,22 +212,48 @@ static void save_cylinder_info(FILE *f, struct dive *dive) if (!o2 && !volume && !start && !end) return; fprintf(f, " type.workingpressure, " workpressure='", "'"); + if (description && *description) + fprintf(f, " description='%s'", description); if (o2) { fprintf(f, " o2='%u.%u%%'", FRACTION(o2, 10)); if (he) fprintf(f, " he='%u.%u%%'", FRACTION(he, 10)); } - if (volume) - show_milli(f, " size='", volume, " l", "'"); - show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'"); - if (description) - fprintf(f, " description='%s'", description); show_pressure(f, cylinder->start, " start='", "'"); show_pressure(f, cylinder->end, " end='", "'"); fprintf(f, " />\n"); } } +static void save_weightsystem_info(FILE *f, struct dive *dive) +{ + int i; + + for (i = 0; i < MAX_WEIGHTSYSTEMS; i++) { + weightsystem_t *ws = dive->weightsystem+i; + int grams = ws->weight.grams; + const char *description = ws->description; + + /* No weight information at all? */ + if (grams == 0) + return; + fprintf(f, " \n"); + } +} + +static void show_index(FILE *f, int value, const char *pre, const char *post) +{ + if (value) + fprintf(f, " %s%d%s", pre, value, post); +} + static void save_sample(FILE *f, struct sample *sample) { fprintf(f, " time.seconds,60)); @@ -200,17 +265,59 @@ static void save_sample(FILE *f, struct sample *sample) fprintf(f, " />\n"); } +static void save_one_event(FILE *f, struct event *ev) +{ + fprintf(f, " time.seconds,60)); + show_index(f, ev->type, "type='", "'"); + show_index(f, ev->flags, "flags='", "'"); + show_index(f, ev->value, "value='", "'"); + show_utf8(f, ev->name, " name='", "'", 1); + fprintf(f, " />\n"); +} + + +static void save_events(FILE *f, struct event *ev) +{ + while (ev) { + save_one_event(f, ev); + ev = ev->next; + } +} + +static void save_trip(FILE *f, struct dive *trip) +{ + struct tm *tm = gmtime(&trip->when); + + fprintf(f, "tm_year+1900, tm->tm_mon+1, tm->tm_mday); + if (trip->location) + show_utf8(f, trip->location, " location=\'","\'", 1); + fprintf(f, " />\n"); +} + static void save_dive(FILE *f, struct dive *dive) { int i; struct tm *tm = gmtime(&dive->when); - fprintf(f, "\n", - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec, + fputs("number) + fprintf(f, " number='%d'", dive->number); + if (dive->tripflag != TF_NONE) + fprintf(f, " tripflag='%s'", tripflag_names[dive->tripflag]); + if (dive->rating) + fprintf(f, " rating='%d'", dive->rating); + fprintf(f, " date='%04u-%02u-%02u'", + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday); + fprintf(f, " time='%02u:%02u:%02u'", + tm->tm_hour, tm->tm_min, tm->tm_sec); + fprintf(f, " duration='%u:%02u min'>\n", FRACTION(dive->duration.seconds, 60)); save_overview(f, dive); save_cylinder_info(f, dive); + save_weightsystem_info(f, dive); + save_events(f, dive->events); for (i = 0; i < dive->samples; i++) save_sample(f, dive->sample+i); fprintf(f, "\n"); @@ -221,15 +328,23 @@ static void save_dive(FILE *f, struct dive *dive) void save_dives(const char *filename) { int i; + GList *trip = NULL; + FILE *f = fopen(filename, "w"); if (!f) return; /* Flush any edits of current dives back to the dives! */ - update_dive(NULL); + update_dive(current_dive); + + fprintf(f, "\n\n", VERSION); + + /* save the trips */ + while ((trip = NEXT_TRIP(trip, dive_trip_list)) != 0) + save_trip(f, trip->data); - fprintf(f, "\n\n", VERSION); + /* save the dives */ for (i = 0; i < dive_table.nr; i++) save_dive(f, get_dive(i)); fprintf(f, "\n");