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

fix site/location build issue

Browse source 
We were assuming these tables were sorted with their indexes, but it
happens to be false, under some circustances at least.

Reported-by: Andreas Hagberg <scubasoft@gmail.com>
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2019-07-25 21:28:57 +02:00 • committed by Robert C. Helling
parent 6e4c3ce6d8
commit 218567bb86
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
smtk-import/smartrak.c
View file

@ -334,8 +334,9 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, struct dive_site **lo
if (!table) if (!table)
return; return;
for (i = 1; i <= atoi(idx); i++) do {
mdb_fetch_row(table); mdb_fetch_row(table);
} while (strcasecmp(col[0]->bind_ptr, idx));
loc_idx = copy_string(col[2]->bind_ptr); loc_idx = copy_string(col[2]->bind_ptr);
site = copy_string(col[1]->bind_ptr); site = copy_string(col[1]->bind_ptr);
loc = create_location(strtod(col[6]->bind_ptr, NULL), strtod(col[7]->bind_ptr, NULL)); loc = create_location(strtod(col[6]->bind_ptr, NULL), strtod(col[7]->bind_ptr, NULL));
@ -360,8 +361,10 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, struct dive_site **lo
/* Read data from Location table, linked to Site by loc_idx */ /* Read data from Location table, linked to Site by loc_idx */
table = smtk_open_table(mdb, "Location", col, bound_values); table = smtk_open_table(mdb, "Location", col, bound_values);
mdb_rewind_table(table); mdb_rewind_table(table);
for (i = 1; i <= atoi(loc_idx); i++) do {
mdb_fetch_row(table); mdb_fetch_row(table);
} while (strcasecmp(col[0]->bind_ptr, loc_idx));
/* /*
* Create a string for Subsurface's dive site structure with coordinates * Create a string for Subsurface's dive site structure with coordinates
* if available, if the site's name doesn't previously exists. * if available, if the site's name doesn't previously exists.