Merge pull request #26 from FAIRDataPipeline/hotfix/gcc_fix

switch to boost/regex

Author: RyanJField

CMakeLists.txt

@@ -63,6 +63,7 @@ INCLUDE( external/curl.cmake )
 INCLUDE( external/yaml_cpp.cmake )
 INCLUDE( external/toml11.cmake )
 INCLUDE( external/ghc.cmake )
+INCLUDE( external/boost_regex.cmake )
 
 # Add the src dirctory compiling it's CMakeLists.txt
 ADD_SUBDIRECTORY( src )

external/boost_regex.cmake

@@ -0,0 +1,15 @@
+MESSAGE( STATUS "[Boost Regex]" )
+
+set(BRX_URL "https://github.com/boostorg/regex/archive/refs/tags/boost-1.79.0.zip")
+
+MESSAGE( STATUS "\tBoost Regex Will be installed." )
+MESSAGE( STATUS "\tURL: ${BRX_URL}" )
+
+set(BOOST_REGEX_STANDALONE ON)
+
+include(FetchContent)
+FetchContent_Declare(
+    BRX
+    URL ${BRX_URL}
+)
+FetchContent_MakeAvailable(BRX)

include/fdp/objects/config.hxx

@@ -15,7 +15,7 @@
 #include <string>
 #include <ghc/filesystem.hpp>
 #include <yaml-cpp/yaml.h>
-#include <regex>
+#include <boost/regex.hpp>
 #include <map>
 #include <ghc/filesystem.hpp>
 #include <stdio.h>

include/fdp/objects/metadata.hxx

@@ -18,7 +18,7 @@
 #include <sstream>
 #include <random>
 #include <chrono>
-#include <regex>
+#include <boost/regex.hpp>
 
 #include "digestpp.hpp"
 

include/fdp/registry/api.hxx

@@ -18,7 +18,7 @@
 #include <iterator>
 #include <json/reader.h>
 #include <map>
-#include <regex>
+#include <boost/regex.hpp>
 #include <string>
 #include <vector>
 

src/CMakeLists.txt

@@ -21,6 +21,7 @@ TARGET_INCLUDE_DIRECTORIES( ${FDPAPI} PUBLIC ${yamlcpp_SOURCE_DIR}/include )
 TARGET_INCLUDE_DIRECTORIES( ${FDPAPI} PUBLIC ${CURL_INCLUDE_DIRS} )
 TARGET_INCLUDE_DIRECTORIES( ${FDPAPI} PUBLIC ${digestpp_SOURCE_DIR} )
 TARGET_INCLUDE_DIRECTORIES( ${FDPAPI} PUBLIC ${ghc_SOURCE_DIR}/include )
+TARGET_INCLUDE_DIRECTORIES( ${FDPAPI} PUBLIC ${brx_SOURCE_DIR}/include )
 # Toml 11 is a header only library no need to link
 TARGET_INCLUDE_DIRECTORIES( ${FDPAPI} PUBLIC ${tomlcpp_SOURCE_DIR} )
 
@@ -29,6 +30,7 @@ TARGET_LINK_LIBRARIES( ${FDPAPI} PUBLIC jsoncpp_static )
 TARGET_LINK_LIBRARIES( ${FDPAPI} PUBLIC digestpp )  
 TARGET_LINK_LIBRARIES( ${FDPAPI} PUBLIC yaml-cpp )
 TARGET_LINK_LIBRARIES( ${FDPAPI} PUBLIC ghc_filesystem )
+TARGET_LINK_LIBRARIES( ${FDPAPI} PUBLIC boost_regex )
 TARGET_LINK_LIBRARIES( ${FDPAPI} PUBLIC ${CURL_LIBRARIES} )
 
 # Install the libraries

src/objects/config.cxx

@@ -327,7 +327,7 @@ void FairDataPipeline::Config::initialise(RESTAPI api_location) {
   Json::Value j_code_repo_root = api_->post("storage_root", repo_storage_root_value_, token_);
   this->code_repo_storage_root_ = ApiObject::from_json( j_code_repo_root );
 
-  std::string repo_storage_path_ = std::regex_replace(meta_data_()["remote_repo"].as<std::string>(), std::regex(repo_storage_root_value_["root"].asString()), "");
+  std::string repo_storage_path_ = boost::regex_replace(meta_data_()["remote_repo"].as<std::string>(), boost::regex(repo_storage_root_value_["root"].asString()), "");
 
   Json::Value repo_storage_location_value_;
   repo_storage_location_value_["hash"] = meta_data_()["latest_commit"].as<std::string>();

src/objects/metadata.cxx

@@ -65,11 +65,11 @@ std::string current_time_stamp(bool file_name) {
 }
 
 std::string remove_local_from_root(const std::string &root){
-  return std::regex_replace(root, std::regex(std::string("file:\\/\\/")), "");
+  return boost::regex_replace(root, boost::regex(std::string("file:\\/\\/")), "");
 }
 
 std::string remove_backslash_from_path(const std::string &path){
-  return std::regex_replace(path, std::regex(std::string("\\\\")), "/");
+  return boost::regex_replace(path, boost::regex(std::string("\\\\")), "/");
 }
 
 bool file_exists( const std::string &Filename )

src/registry/api.cxx

@@ -95,7 +95,7 @@ CURL *API::setup_download_session_(const ghc::filesystem::path &addr_path,
 
 Json::Value API::get_request(const ghc::filesystem::path &addr_path,
                          long expected_response, std::string token) {
-  std::string addr_path_ = std::regex_replace(addr_path.string(), std::regex(std::string("\\\\")), "/");
+  std::string addr_path_ = boost::regex_replace(addr_path.string(), boost::regex(std::string("\\\\")), "/");
   return get_request(addr_path_, expected_response);
 }
 
@@ -180,16 +180,16 @@ std::string API::json_to_query_string(Json::Value &json_value) {
           // add the key and value to the return string after removing the api
           // address with regex
           rtn += key + "=" +
-                 std::regex_replace(json_value.get(key, "")[i].asString(),
-                                    std::regex(regex_string), "$3") +
+                 boost::regex_replace(json_value.get(key, "")[i].asString(),
+                                    boost::regex(regex_string), "$3") +
                  "&";
         }
       } else {
         // if it's not an array add the key and value to the return string after
         // removing the api address with regex
         rtn += key + "=" +
-               std::regex_replace(json_value.get(key, "").asString(),
-                                  std::regex(regex_string), "$3") +
+               boost::regex_replace(json_value.get(key, "").asString(),
+                                  boost::regex(regex_string), "$3") +
                "&";
       }
     }
@@ -200,7 +200,7 @@ std::string API::json_to_query_string(Json::Value &json_value) {
 
 std::string API::escape_space(std::string &str) {
   // Using regex replace space with html character (%20)
-  return std::string(std::regex_replace(str, std::regex(" "), "%20"));
+  return std::string(boost::regex_replace(str, boost::regex(" "), "%20"));
 }
 
 Json::Value API::post(std::string addr_path, Json::Value &post_data,