Merge pull request #30 from TanguyBarthelemy/master

resolve bugs

.Rbuildignore

@@ -14,3 +14,4 @@ cran-comments.md
 ^LICENCE_en$
 
 TO_DO
+.lintr

R/metadata.R

@@ -33,11 +33,11 @@
 #' compute(ws_2)
 #'
 #' updated_workspace <- update_metadata_roughly(ws_from = ws_1, ws_to = ws_2)
-#' path_to_output <- file.path(tempfile(), "ws_update_meta_roughly.xml")
+#' path_to_output <- file.path(tempdir(), "ws_update_meta_roughly.xml")
 #' save_workspace(workspace = updated_workspace, file = path_to_output)
 #'
 #' updated_workspace <- update_metadata(ws_from = ws_1, ws_to = ws_2)
-#' path_to_output <- file.path(tempfile(), "ws_update_meta.xml")
+#' path_to_output <- file.path(tempdir(), "ws_update_meta.xml")
 #' save_workspace(workspace = updated_workspace, file = path_to_output)
 #'
 #' @name update_metadata

R/update_path.R

@@ -58,11 +58,7 @@ update_one_xml <- function(xml_path, pos_sa_item, formatted_path) {
                               "#series", chain2)
 
     XML::xmlAttrs(node_to_change) <- attrib
-
-
-    new_xml_path <- "~/temp/fichier2.xml"
-    XML::saveXML(doc = xml_file, file = new_xml_path)
-
+    XML::saveXML(doc = xml_file, file = xml_path)
     return(invisible(NULL))
 }
 
@@ -79,12 +75,14 @@ check_information <- function(ws_xml_path, pos_sap, pos_sa_item) {
         pattern = "\\.xml$", replacement = "",
         x = ws_xml_path
     )
-    all_xml_sap <- list.files(sprintf("%s/SAProcessing", ws_folder_path),
-        pattern = "\\.xml$"
+
+    all_xml_sap_path <- list.files(
+        path = sprintf("%s/SAProcessing", ws_folder_path),
+        pattern = "\\.xml$", full.names = TRUE
     )
 
     if ((!missing(pos_sap))
-        && (!paste0("SAProcessing-", pos_sap, ".xml") %in% all_xml_sap)) {
+        && (!paste0("SAProcessing-", pos_sap, ".xml") %in% all_xml_sap_path)) {
         stop("The SA-Processing doesn't exist.")
     }
 
@@ -194,13 +192,13 @@ update_path <- function(ws_xml_path, raw_data_path, pos_sap, pos_sa_item) {
         pattern = "\\.xml$", replacement = "",
         x = ws_xml_path
     )
-    all_xml_sap <- list.files(
+    all_xml_files <- list.files(
         path = sprintf("%s/SAProcessing", ws_folder_path),
-        pattern = "\\.xml$", full.names = TRUE
+        pattern = "\\.xml$", full.names = FALSE, all.files = TRUE
     )
 
     if ((!missing(pos_sap))
-        && (!paste0("SAProcessing-", pos_sap, ".xml") %in% all_xml_sap)) {
+        && (!paste0("SAProcessing-", pos_sap, ".xml") %in% all_xml_files)) {
         stop("The SA-Processing doesn't exist.")
     }
 
@@ -225,10 +223,14 @@ update_path <- function(ws_xml_path, raw_data_path, pos_sap, pos_sa_item) {
     }
 
     new_raw_data_path <- format_path_to_xml(raw_data_path)
+    all_xml_sap_path <- list.files(
+        path = sprintf("%s/SAProcessing", ws_folder_path),
+        pattern = "\\.xml$", full.names = TRUE
+    )
 
     if (missing(pos_sap)) {
-        for (pos_sap in seq_along(all_xml_sap)) {
-            xml_path <- all_xml_sap[pos_sap]
+        for (pos_sap in seq_along(all_xml_sap_path)) {
+            xml_path <- all_xml_sap_path[pos_sap]
             nb_sa_item <- RJDemetra::count(
                 RJDemetra::get_object(ws, pos = pos_sap)
             )
@@ -237,7 +239,7 @@ update_path <- function(ws_xml_path, raw_data_path, pos_sap, pos_sa_item) {
                 update_one_xml(
                     xml_path = xml_path,
                     pos_sa_item = pos2,
-                    formatted_data_path = new_raw_data_path
+                    formatted_path = new_raw_data_path
                 )
             }
         }
@@ -252,15 +254,15 @@ update_path <- function(ws_xml_path, raw_data_path, pos_sap, pos_sa_item) {
                 update_one_xml(
                     xml_path = xml_path,
                     pos_sa_item = pos,
-                    formatted_data_path = new_raw_data_path
+                    formatted_path = new_raw_data_path
                 )
             }
         } else {
             for (pos in pos_sa_item) {
                 update_one_xml(
                     xml_path = xml_path,
                     pos_sa_item = pos,
-                    formatted_data_path = new_raw_data_path
+                    formatted_path = new_raw_data_path
                 )
             }
         }