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

Pick up dive numbers from Uemis SDA when starting with empty data file

Browse source 
This is improving a bit more on commit d2dd0eb39efe "When starting with an
empty data file and downloading dives, number them" by providing a better
starting number when a user downloads dives from a Uemis SDA into an empty
data file.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-05 10:24:21 -08:00
parent 0141b69d0a
commit 1e074f3fb2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
uemis-downloader.c
View file

@ -603,7 +603,7 @@ static void parse_tag(struct dive *dive, char *tag, char *val)
* index into yet another data store that we read out later. In order to * index into yet another data store that we read out later. In order to
* correctly populate the location and gps data from that we need to remember * correctly populate the location and gps data from that we need to remember
* the adresses of those fields for every dive that references the divespot. */ * the adresses of those fields for every dive that references the divespot. */
static void process_raw_buffer(int deviceid, char *inbuf, char **max_divenr) static void process_raw_buffer(int deviceid, char *inbuf, char **max_divenr, gboolean keep_number)
{ {
char *buf = strdup(inbuf); char *buf = strdup(inbuf);
char *tp, *bp, *tag, *type, *val; char *tp, *bp, *tag, *type, *val;
@ -664,6 +664,8 @@ static void process_raw_buffer(int deviceid, char *inbuf, char **max_divenr)
free(*max_divenr); free(*max_divenr);
*max_divenr = strdup(val); *max_divenr = strdup(val);
dive->dc.diveid = atoi(val); dive->dc.diveid = atoi(val);
if (keep_number)
dive->number = atoi(val);
} else if (!log && ! strcmp(tag, "logfilenr")) { } else if (!log && ! strcmp(tag, "logfilenr")) {
/* this one tells us which dive we are adding data to */ /* this one tells us which dive we are adding data to */
dive = get_dive_by_diveid(atoi(val), deviceid); dive = get_dive_by_diveid(atoi(val), deviceid);
@ -721,8 +723,10 @@ static char *do_uemis_download(struct argument_block *args)
char *deviceid = NULL; char *deviceid = NULL;
char *result = NULL; char *result = NULL;
char *endptr; char *endptr;
gboolean success; gboolean success, keep_number = FALSE;
if (dive_table.nr == 0)
keep_number = TRUE;
uemis_info("Init Communication"); uemis_info("Init Communication");
if (! uemis_init(mountpath)) if (! uemis_init(mountpath))
return _("Uemis init failed"); return _("Uemis init failed");
@ -756,7 +760,7 @@ static char *do_uemis_download(struct argument_block *args)
success = uemis_get_answer(mountpath, "getDivelogs", 3, 0, &result); success = uemis_get_answer(mountpath, "getDivelogs", 3, 0, &result);
/* process the buffer we have assembled */ /* process the buffer we have assembled */
if (mbuf) if (mbuf)
process_raw_buffer(deviceidnr, mbuf, &newmax); process_raw_buffer(deviceidnr, mbuf, &newmax, keep_number);
/* if the user clicked cancel, exit gracefully */ /* if the user clicked cancel, exit gracefully */
if (import_thread_cancelled) if (import_thread_cancelled)
goto bail; goto bail;
@ -784,7 +788,7 @@ static char *do_uemis_download(struct argument_block *args)
param_buff[2] = objectid; param_buff[2] = objectid;
success = uemis_get_answer(mountpath, "getDive", 3, 0, &result); success = uemis_get_answer(mountpath, "getDive", 3, 0, &result);
if (mbuf) if (mbuf)
process_raw_buffer(deviceidnr, mbuf, &newmax); process_raw_buffer(deviceidnr, mbuf, &newmax, FALSE);
if (!success || import_thread_cancelled) if (!success || import_thread_cancelled)
break; break;
} }