mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-08 01:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove suunto parsing hacks from parse-xml.c

Browse source 
We can just depend on Miika's xslt transform instead.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-11-21 11:35:06 -08:00
parent 61f3114fce
commit e5471e3fe8
1 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
parse-xml.c
View file

@ -110,7 +110,6 @@ static int cylinder_index;
static enum import_source { static enum import_source {
UNKNOWN, UNKNOWN,
LIBDIVECOMPUTER, LIBDIVECOMPUTER,
SUUNTO,
UEMIS, UEMIS,
DIVINGLOG, DIVINGLOG,
UDDF, UDDF,
@ -644,26 +643,6 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
nonmatch("sample", name, buf); nonmatch("sample", name, buf);
} }
/*
* Crazy suunto xml. Look at how those o2/he things match up.
*/
static int suunto_dive_match(struct dive **divep, const char *name, int len, char *buf)
{
struct dive *dive = *divep;
return MATCH(".o2pct", percent, &dive->cylinder[0].gasmix.o2) ||
MATCH(".hepct_0", percent, &dive->cylinder[0].gasmix.he) ||
MATCH(".o2pct_2", percent, &dive->cylinder[1].gasmix.o2) ||
MATCH(".hepct_1", percent, &dive->cylinder[1].gasmix.he) ||
MATCH(".o2pct_3", percent, &dive->cylinder[2].gasmix.o2) ||
MATCH(".hepct_2", percent, &dive->cylinder[2].gasmix.he) ||
MATCH(".o2pct_4", percent, &dive->cylinder[3].gasmix.o2) ||
MATCH(".hepct_3", percent, &dive->cylinder[3].gasmix.he) ||
MATCH(".cylindersize", cylindersize, &dive->cylinder[0].type.size) ||
MATCH(".cylinderworkpressure", pressure, &dive->cylinder[0].type.workingpressure) ||
0;
}
static const char *country, *city; static const char *country, *city;
static void divinglog_place(char *place, void *_location) static void divinglog_place(char *place, void *_location)
@ -978,11 +957,6 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
start_match("dive", name, buf); start_match("dive", name, buf);
switch (import_source) { switch (import_source) {
case SUUNTO:
if (suunto_dive_match(divep, name, len, buf))
return;
break;
case UEMIS: case UEMIS:
if (uemis_dive_match(divep, name, len, buf)) if (uemis_dive_match(divep, name, len, buf))
return; return;
@ -1180,7 +1154,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
if (!type->size.mliter) if (!type->size.mliter)
return; return;
if (input_units.volume == CUFT || import_source == SUUNTO) { if (input_units.volume == CUFT) {
/* confusing - we don't really start from ml but millicuft !*/ /* confusing - we don't really start from ml but millicuft !*/
volume_of_air = cuft_to_l(type->size.mliter); volume_of_air = cuft_to_l(type->size.mliter);
atm = to_ATM(type->workingpressure); /* working pressure in atm */ atm = to_ATM(type->workingpressure); /* working pressure in atm */
@ -1348,12 +1322,6 @@ static void visit(xmlNode *n)
traverse(n->children); traverse(n->children);
} }
static void suunto_importer(void)
{
import_source = SUUNTO;
input_units = SI_units;
}
static void uemis_importer(void) static void uemis_importer(void)
{ {
import_source = UEMIS; import_source = UEMIS;
@ -1405,7 +1373,6 @@ static struct nesting {
{ "P", sample_start, sample_end }, { "P", sample_start, sample_end },
/* Import type recognition */ /* Import type recognition */
{ "SUUNTO", suunto_importer },
{ "Divinglog", DivingLog_importer }, { "Divinglog", DivingLog_importer },
{ "pre_dive", uemis_importer }, { "pre_dive", uemis_importer },
{ "dives", uemis_importer }, { "dives", uemis_importer },