Support relative paths for cse_config_parser and ssp_parser (#410)

* Make path absolute for cse_config_parser and ssp_parser. Closes #407. Closes #309. * Run clang-format
open-simulation-platform · Oct 9, 2019 · 8481ade · 8481ade
1 parent f239523
commit 8481ade
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/cpp/cse_config_parser.cpp b/src/cpp/cse_config_parser.cpp
@@ -681,9 +681,10 @@ std::pair<execution, simulator_map> load_cse_config(
     std::optional<time_point> overrideStartTime)
 {
     simulator_map simulatorMap;
-    const auto configFile = boost::filesystem::is_regular_file(configPath)
-        ? configPath
-        : configPath / "OspSystemStructure.xml";
+    const auto absolutePath = boost::filesystem::absolute(configPath);
+    const auto configFile = boost::filesystem::is_regular_file(absolutePath)
+        ? absolutePath
+        : absolutePath / "OspSystemStructure.xml";
     const auto baseURI = path_to_file_uri(configFile);
 
     const auto parser = cse_config_parser(configFile);

diff --git a/src/cpp/ssp_parser.cpp b/src/cpp/ssp_parser.cpp
@@ -307,9 +307,10 @@ std::pair<execution, simulator_map> load_ssp(
     std::optional<cse::time_point> overrideStartTime)
 {
     simulator_map simulatorMap;
-    const auto configFile = boost::filesystem::is_regular_file(configPath)
-                            ? configPath
-                            : configPath / "SystemStructure.ssd";
+    const auto absolutePath = boost::filesystem::absolute(configPath);
+    const auto configFile = boost::filesystem::is_regular_file(absolutePath)
+        ? absolutePath
+        : absolutePath / "SystemStructure.ssd";
     const auto baseURI = path_to_file_uri(configFile);
     const auto parser = ssp_parser(configFile);