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

Parser: remove webservice related code

Browse source 
Recently, the subsurface webservice was removed. Remove the corresponding
code in the parser. This removes a static variable, which was used
to generate unique dive-site ids.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-22 12:42:09 +02:00 • committed by Dirk Hohndel
parent 9c6d24e50e
commit ee0fc25cf3
3 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/parse-xml.c
View file

@ -1520,11 +1520,6 @@ static void uddf_importer(void)
xml_parsing_units.temperature = KELVIN; xml_parsing_units.temperature = KELVIN;
} }
static void subsurface_webservice(void)
{
import_source = SSRF_WS;
}
/* /*
* I'm sure this could be done as some fancy DTD rules. * I'm sure this could be done as some fancy DTD rules.
* It's just not worth the headache. * It's just not worth the headache.
@ -1557,7 +1552,6 @@ static struct nesting {
/* Import type recognition */ /* Import type recognition */
{ "Divinglog", DivingLog_importer }, { "Divinglog", DivingLog_importer },
{ "uddf", uddf_importer }, { "uddf", uddf_importer },
{ "output", subsurface_webservice },
{ NULL, } { NULL, }
}; };

13
core/parse.c
View file

@ -411,7 +411,6 @@ void utf8_string(char *buffer, void *_res)
void add_dive_site(char *ds_name, struct dive *dive) void add_dive_site(char *ds_name, struct dive *dive)
{ {
static int suffix = 1;
char *buffer = ds_name; char *buffer = ds_name;
char *to_free = NULL; char *to_free = NULL;
int size = trimspace(buffer); int size = trimspace(buffer);
@ -426,18 +425,6 @@ void add_dive_site(char *ds_name, struct dive *dive)
if (!uuid) { if (!uuid) {
// if the dive doesn't have a uuid, check if there's already a dive site by this name // if the dive doesn't have a uuid, check if there's already a dive site by this name
uuid = get_dive_site_uuid_by_name(buffer, &ds); uuid = get_dive_site_uuid_by_name(buffer, &ds);
if (uuid && import_source == SSRF_WS) {
// when downloading GPS fixes from the Subsurface webservice we will often
// get a lot of dives with identical names (the autogenerated fixes).
// So in this case modify the name to make it unique
int name_size = strlen(buffer) + 10; // 8 digits - enough for 100 million sites
to_free = buffer = malloc(name_size);
do {
suffix++;
snprintf(buffer, name_size, "%s %8d", ds_name, suffix);
} while (get_dive_site_uuid_by_name(buffer, NULL) != 0);
ds = NULL;
}
} }
if (ds) { if (ds) {
// we have a uuid, let's hope there isn't a different name // we have a uuid, let's hope there isn't a different name

1
core/parse.h
View file

@ -46,7 +46,6 @@ enum import_source {
LIBDIVECOMPUTER, LIBDIVECOMPUTER,
DIVINGLOG, DIVINGLOG,
UDDF, UDDF,
SSRF_WS,
} import_source; } import_source;
/* the dive table holds the overall dive list; target table points at /* the dive table holds the overall dive list; target table points at