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

Recognize another name for auto created fixes from companion app

Browse source 
We need to have this be one well defined string -> this requires a change
to the companion app as well.

This commit also hides the (untranslated) debug message if no dives in the
dive table match a gpsfix downloaded from the webservice.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-03-02 14:00:10 -08:00
parent d85b4e6462
commit 0ddc77ed9d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
webservice.c
View file

@ -169,8 +169,8 @@ static void download_dialog_response_cb(GtkDialog *d, gint response, gpointer da
static gboolean is_automatic_fix(struct dive *gpsfix) static gboolean is_automatic_fix(struct dive *gpsfix)
{ {
if (gpsfix && gpsfix->location && if (gpsfix && gpsfix->location &&
!strcmp(gpsfix->location, "automatic fix") && (!strcmp(gpsfix->location, "automatic fix") ||
!strcmp(gpsfix->location, "Auto-created dive")) !strcmp(gpsfix->location, "Auto-created dive")))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
@ -189,6 +189,14 @@ static gboolean merge_locations_into_dives(void)
if (is_automatic_fix(gpsfix)) { if (is_automatic_fix(gpsfix)) {
dive = find_dive_including(gpsfix->when); dive = find_dive_including(gpsfix->when);
if (dive && !dive_has_gps_location(dive)) { if (dive && !dive_has_gps_location(dive)) {
#if DEBUG_WEBSERVICE
struct tm tm;
utc_mkdate(gpsfix->when, &tm);
printf("found dive named %s @ %04d-%02d-%02d %02d:%02d:%02d\n",
gpsfix->location,
tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
#endif
changed++; changed++;
copy_gps_location(gpsfix, dive); copy_gps_location(gpsfix, dive);
} }
@ -212,10 +220,12 @@ static gboolean merge_locations_into_dives(void)
} else { } else {
struct tm tm; struct tm tm;
utc_mkdate(gpsfix->when, &tm); utc_mkdate(gpsfix->when, &tm);
#if DEBUG_WEBSERVICE
printf("didn't find dive matching gps fix named %s @ %04d-%02d-%02d %02d:%02d:%02d\n", printf("didn't find dive matching gps fix named %s @ %04d-%02d-%02d %02d:%02d:%02d\n",
gpsfix->location, gpsfix->location,
tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
#endif
} }
} }
} }