X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=5c05723b71e1ebf5df39a0c9f977d6d0f6ccb6e5;hb=31123f63af0a2b6a9756b8496f56359d1c68a645;hp=cd7bad2bad547e652529a301ab8dba9dee3f55cd;hpb=22fcef2ec7fd1efd3d1df2aba2b7b3af5d463288;p=ext%2Fsubsurface.git
diff --git a/save-xml.c b/save-xml.c
index cd7bad2..5c05723 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -44,6 +44,10 @@ static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const c
* We're outputting utf8 in xml.
* We need to quote the characters <, >, &.
*
+ * Technically I don't think we'd necessarily need to quote the control
+ * 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).
*/
@@ -60,6 +64,11 @@ static void quote(FILE *f, const char *text)
case 0:
escape = NULL;
break;
+ case 1 ... 8:
+ case 11: case 12:
+ case 14 ... 31:
+ escape = "?";
+ break;
case '<':
escape = "<";
break;
@@ -102,7 +111,7 @@ static void save_overview(FILE *f, struct dive *dive)
show_depth(f, dive->maxdepth, " ", "\n");
show_depth(f, dive->meandepth, " ", "\n");
show_temperature(f, dive->airtemp, " ", "\n");
- show_temperature(f, dive->watertemp, " ", "\n");
+ show_temperature(f, dive->watertemp, " ", "\n");
show_duration(f, dive->duration, " ", "\n");
show_duration(f, dive->surfacetime, " ", "\n");
show_pressure(f, dive->beginning_pressure, " ", "\n");
@@ -111,21 +120,32 @@ static void save_overview(FILE *f, struct dive *dive)
show_utf8(f, dive->notes, " ","\n");
}
-static void save_gasmix(FILE *f, struct dive *dive)
+static void save_cylinder_info(FILE *f, struct dive *dive)
{
int i;
- for (i = 0; i < MAX_MIXES; i++) {
- gasmix_t *mix = dive->gasmix+i;
- int o2 = mix->o2.permille, he = mix->he.permille;
- int n2 = 1000 - o2 - he;
+ for (i = 0; i < MAX_CYLINDERS; i++) {
+ cylinder_t *cylinder = dive->cylinder+i;
+ int volume = cylinder->type.size.mliter;
+ int pressure = cylinder->type.workingpressure.mbar;
+ int o2 = cylinder->gasmix.o2.permille;
+ int he = cylinder->gasmix.he.permille;
- if (!mix->o2.permille)
+ /* No cylinder information at all? */
+ if (!o2 && !volume)
return;
- fprintf(f, " he.permille)
- fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
- fprintf(f, " n2='%u.%u%%' />\n", FRACTION(n2, 10));
+ fprintf(f, " \n");
}
}
@@ -135,9 +155,9 @@ static void save_sample(FILE *f, struct sample *sample)
FRACTION(sample->time.seconds,60),
FRACTION(sample->depth.mm, 1000));
show_temperature(f, sample->temperature, " temp='", "'");
- show_pressure(f, sample->tankpressure, " pressure='", "'");
- if (sample->tankindex)
- fprintf(f, " tankindex='%d'", sample->tankindex);
+ show_pressure(f, sample->cylinderpressure, " pressure='", "'");
+ if (sample->cylinderindex)
+ fprintf(f, " cylinderindex='%d'", sample->cylinderindex);
fprintf(f, " />\n");
}
@@ -150,7 +170,7 @@ static void save_dive(FILE *f, struct dive *dive)
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
save_overview(f, dive);
- save_gasmix(f, dive);
+ save_cylinder_info(f, dive);
for (i = 0; i < dive->samples; i++)
save_sample(f, dive->sample+i);
fprintf(f, "\n");
@@ -173,4 +193,5 @@ void save_dives(const char *filename)
for (i = 0; i < dive_table.nr; i++)
save_dive(f, get_dive(i));
fprintf(f, "\n");
+ fclose(f);
}