resolve conflicts versions

Merge branch 'master' of https://github.com/rte-antares-rpackage/antaresRead into feature/ant1795v2 # Conflicts: # NEWS.md
rte-antares-rpackage · Oct 14, 2024 · f9a2449 · f9a2449
2 parents a402ebb + af29dc6
commit f9a2449
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,14 @@
 > Copyright © 2016 RTE Réseau de transport d’électricité
 
+
 # antaresRead 2.8.0.9000 
 (cf. Antares v9 changelog)
 
+BUGFIXES :
+* `setSimulationPathAPI()` : encode URL before reading the data in simulation mode
+
+BREAKING CHANGES :  
+* `setSimulationPathAPI()` : reads and returns the new converted study version format (ex : 9.0 => 900)
 
 
 # antaresRead 2.7.2
@@ -21,6 +27,7 @@ BUGFIXES :
 
 * `setSimulationPathAPI()`: control the existence of the output folder **links** or **areas** before reading the data (upgrade Antares Web)
 * `readClusterDesc()` / `readClusterResDesc()` / `readClusterSTDesc()` return a data.table in API mode
+* `setSimulationPathAPI()` : encode URL before reading the data in simulation mode
 
 
 # antaresRead 2.7.1 

diff --git a/R/setSimulationPathAPI.R b/R/setSimulationPathAPI.R
@@ -496,7 +496,9 @@ setSimulationPathAPI <- function(host, study_id, token, simulation = NULL,
     if (type == "links") {
       path_element <- gsub(pattern = " - ", replacement = "/", x = path_element)
     }
+    path_element <- URLencode(path_element, reserved = TRUE)
     d <- file.path(path, type, path_element)
+    d <- URLencode(d)
     f <- names(read_secure_json(paste0(d, "&depth=1"), ...))
     f <- f[grep("values", f)]
     if (length(f) > 0) {