diff --git a/R/api.R b/R/api.R index f71c1dbca759f9b9782fc0ae1ffc0c7adc85ea25..2c4fe6a98ecaf448f653c7112247e3845492d997 100644 --- a/R/api.R +++ b/R/api.R @@ -107,12 +107,15 @@ mk_comp_tab <- function(m) { } ##' @export -read_conf <- function(fn_conf) { - assert(file.exists(fn_conf),msg=paste("Unable to read the configuration file:", fn_conf)) - conf <- yaml::yaml.load_file(fn_conf) - conf <- vrfy_conf(conf) - conf +read_conf <- function(fn) { + yaml::yaml.load_file(fn) } +## read_conf <- function(fn_conf) { +## assert(file.exists(fn_conf),msg=paste("Unable to read the configuration file:", fn_conf)) +## conf <- yaml::yaml.load_file(fn_conf) +## conf <- vrfy_conf(conf) +## conf +## } ##' @export vrfy_conf <- function(conf) { diff --git a/R/mix.R b/R/mix.R index 30790e460ed8b24815b1a2bf394da0fdb9a1e0ac..6c22ce76624ead13a2aef38c8bd9e34eab11e98f 100644 --- a/R/mix.R +++ b/R/mix.R @@ -596,12 +596,16 @@ read_setid <- function(fn,known,unk) { } -write_conf <- function(conf,fn) { - yaml::write_yaml(x=conf,file=fn) +write_conf <- function(m,fn) { + m$conf$data <- file.path(m$conf$project,FN_DATA_TAB) + yaml::write_yaml(x=m$conf,file=fn) + + + } - -read_conf <- function(fn) { - yaml::yaml.load_file(fn) +write_state <- function(m,fn_conf) { + write_conf(m,fn_conf) + tab2file(tab=m$input$tab$mzml,file=file.path(m$conf$project,FN_DATA_TAB)) } new_state <- function(conf,GUI) {