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

Divinglog import: use dive ID as identifier

Browse source 
Since mapping cylinders requires use of dive ID, we might as well use
the ID to map the profile also.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-07-12 23:16:59 +05:30 • committed by Dirk Hohndel
parent a52fc86a1c
commit c91ee860f2
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
parse-xml.c
View file

@ -2985,7 +2985,7 @@ extern int divinglog_dive(void *param, int columns, char **data, char **column)
int retval = 0, diveid; int retval = 0, diveid;
sqlite3 *handle = (sqlite3 *)param; sqlite3 *handle = (sqlite3 *)param;
char *err = NULL; char *err = NULL;
char get_profile_template[] = "select ProfileInt,Profile,Profile2 from Logbook where Number = %d"; char get_profile_template[] = "select ProfileInt,Profile,Profile2 from Logbook where ID = %d";
char get_cylinder_template[] = "select TankID,TankSize,PresS,PresE,PresW,O2,He,DblTank from Tank where LogID = %d order by TankID"; char get_cylinder_template[] = "select TankID,TankSize,PresS,PresE,PresW,O2,He,DblTank from Tank where LogID = %d order by TankID";
char get_buffer[1024]; char get_buffer[1024];
@ -3053,13 +3053,7 @@ extern int divinglog_dive(void *param, int columns, char **data, char **column)
cur_dive->dc.model = strdup("Divinglog import"); cur_dive->dc.model = strdup("Divinglog import");
} }
/* snprintf(get_buffer, sizeof(get_buffer) - 1, get_profile_template, diveid);
* Parse Profile - depth and warnings
* I am assuming that dive number is unique, but if not, then we
* will have to use ID instead.
*/
snprintf(get_buffer, sizeof(get_buffer) - 1, get_profile_template, cur_dive->number);
retval = sqlite3_exec(handle, get_buffer, &divinglog_profile, 0, &err); retval = sqlite3_exec(handle, get_buffer, &divinglog_profile, 0, &err);
if (retval != SQLITE_OK) { if (retval != SQLITE_OK) {
fprintf(stderr, "%s", "Database query divinglog_profile failed.\n"); fprintf(stderr, "%s", "Database query divinglog_profile failed.\n");