osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-26 22:44:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix small bug in index.c

Browse Source
This commit is contained in:
markigail 2016-05-03 12:52:08 +02:00
parent 2ba9c11dd0
commit 1a4f369e2b
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nominatim/index.c
View File

@ -163,11 +163,12 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
{ {
if (interpolation) if (interpolation)
{ {
iResult = PQsendQueryPrepared(conn, "index_sector_places", 2, paramValues, paramLengths, paramFormats, 1); iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 1, paramValues, paramLengths, paramFormats, 1);
} }
else else
{ {
iResult = PQsendQueryPrepared(conn, "index_sector_places_osmline", 1, paramValues, paramLengths, paramFormats, 1); iResult = PQsendQueryPrepared(conn, "index_sector_places", 2, paramValues, paramLengths, paramFormats, 1);
} }
} }
if (!iResult) if (!iResult)
@ -244,8 +245,6 @@ struct index_thread_data * thread_data, const char *structuredoutputfile)
fprintf(stderr, "\r Done %i in %i @ %f per second - FINISHED\n\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond); fprintf(stderr, "\r Done %i in %i @ %f per second - FINISHED\n\n", rankCountTuples, (int)(difftime(time(0), rankStartTime)), rankPerSecond);
PQclear(resSectors); PQclear(resSectors);
} }
void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile) void nominatim_index(int rank_min, int rank_max, int num_threads, const char *conninfo, const char *structuredoutputfile)
@ -404,17 +403,12 @@ void nominatim_index(int rank_min, int rank_max, int num_threads, const char *co
} }
run_indexing(rank, 0, conn, num_threads, thread_data, structuredoutputfile); run_indexing(rank, 0, conn, num_threads, thread_data, structuredoutputfile);
} }
// Close all connections
for (i = 0; i < num_threads; i++)
if (rank == 30) {
{ PQfinish(thread_data[i].conn);
// Close all connections }
for (i = 0; i < num_threads; i++) PQfinish(conn);
{
PQfinish(thread_data[i].conn);
}
PQfinish(conn);
}
} }
void *nominatim_indexThread(void * thread_data_in) void *nominatim_indexThread(void * thread_data_in)