kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 11:22:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a small (private) support for geo query.

Browse Source 
This use the small API of kiwix-lib and so, cannot search a text query
and filter around a geo position in the same time.

There is no way to do a search but than write directly the search url
by hand.

If the request is wrongly formatted, the search is simply not done without
error message.
This commit is contained in:
Matthieu Gautier 2017-11-14 17:42:01 +01:00
parent 05c734fc31
commit 4fffaf41b6
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/server/kiwix-serve.cpp
View File

@ -453,6 +453,26 @@ static struct MHD_Response* handle_search(RequestContext* request_context)
std::string patternString
= kiwix::urlDecode(pattern == NULL ? "" : string(pattern));
/* Retrive geo search */
bool has_geo_query = false;
const char* latitude = MHD_lookup_connection_value(
request_context->connection, MHD_GET_ARGUMENT_KIND, "latitude");
const char* longitude = MHD_lookup_connection_value(
request_context->connection, MHD_GET_ARGUMENT_KIND, "longitude");
const char* distance = MHD_lookup_connection_value(
request_context->connection, MHD_GET_ARGUMENT_KIND, "distance");
float latitudeFloat(0), longitudeFloat(0), distanceFloat(0);
if (latitude != nullptr && longitude != nullptr && distance != nullptr) {
try {
latitudeFloat = stof(string(latitude));
longitudeFloat = stof(string(longitude));
distanceFloat = stof(string(distance));
has_geo_query = true;
} catch (...) {}
}
/* Search results for searches from the welcome page should not
be cached
*/
@ -491,7 +511,13 @@ static struct MHD_Response* handle_search(RequestContext* request_context)
/* Get the results */
pthread_mutex_lock(&searchLock);
try {
request_context->searcher->search(patternString, startNumber, endNumber, isVerbose.load());
if (patternString.empty() && has_geo_query) {
request_context->searcher->geo_search(latitudeFloat, longitudeFloat, distanceFloat,
startNumber, endNumber, isVerbose.load());
} else {
request_context->searcher->search(patternString,
startNumber, endNumber, isVerbose.load());
}
content = request_context->searcher->getHtml();
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;