dont hardcode EXECUTABLE_OUTPUT_PATH to build, handle URLs with empty…

… GET parameter correctly
ad-freiburg · Oct 9, 2023 · 761a197 · 761a197
1 parent f587e80
commit 761a197
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 enable_testing()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}")
 
 
 find_package(OpenMP)
@@ -76,6 +76,6 @@ add_subdirectory(src)
 
 # install target
 install(
-  FILES build/qlever-mapui DESTINATION bin
+  FILES ${CMAKE_BINARY_DIR}/petrimaps DESTINATION bin
   PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
 )
diff --git a/src/qlever-petrimaps/GeomCache.cpp b/src/qlever-petrimaps/GeomCache.cpp
@@ -1071,6 +1071,7 @@ void GeomCache::serializeToDisk(const std::string& fname) const {
 
 // _____________________________________________________________________________
 std::string GeomCache::requestIndexHash() {
+  std::cout << "HASH REQUEST" << std::endl;
   CURLcode res;
   char errbuf[CURL_ERROR_SIZE];
   std::string response;

diff --git a/src/qlever-petrimaps/server/Server.cpp b/src/qlever-petrimaps/server/Server.cpp
@@ -845,6 +845,7 @@ std::string Server::parseUrl(std::string u, std::string pl,
     auto kvs = util::split(parts[1], '&');
     for (const auto& kv : kvs) {
       auto kvp = util::split(kv, '=', 2);
+      if (kvp.size() == 0) continue;
       if (kvp.size() == 1) kvp.push_back("");
       (*params)[util::urlDecode(kvp[0])] = util::urlDecode(kvp[1]);
     }
@@ -854,6 +855,7 @@ std::string Server::parseUrl(std::string u, std::string pl,
   auto kvs = util::split(pl, '&');
   for (const auto& kv : kvs) {
     auto kvp = util::split(kv, '=', 2);
+    if (kvp.size() == 0) continue;
     if (kvp.size() == 1) kvp.push_back("");
     (*params)[util::urlDecode(kvp[0])] = util::urlDecode(kvp[1]);
   }