From dc72dbc6381098bc700de93712ba8f0ba8c6a544 Mon Sep 17 00:00:00 2001 From: Jeremy Wildfire Date: Tue, 19 Oct 2021 12:49:22 -0400 Subject: [PATCH 1/2] Allow non-standard data in autoMapping. fix #642 --- R/makeMapping.R | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/R/makeMapping.R b/R/makeMapping.R index a1882d12..e84b0bf5 100644 --- a/R/makeMapping.R +++ b/R/makeMapping.R @@ -21,8 +21,13 @@ makeMapping <- function(domainData, meta, autoMapping, customMapping ){ }) names(standards)<-names(domainData) - auto_mapping_list <- standards %>% map(~.x$mapping) - auto_mapping_df<-bind_rows(auto_mapping_list, .id = "domain") %>% select(-.data$valid) + auto_mapping_list <- standards %>% map(function(standard){ + if(standard$standard=="none"){ + return(data.frame(domain=character(), text_key=character(), current=character(), valid=logical())) + }else{ + return(standard$mapping) + } + }) auto_mapping_df<-bind_rows(auto_mapping_list, .id = "domain") %>% select(-.data$valid) }else{ # otherwise initialize NULL standards/mapping standards<-NULL From 04a82bc0b9c93170196a3562ec54b14d1ea2e77b Mon Sep 17 00:00:00 2001 From: Jeremy Wildfire Date: Wed, 20 Oct 2021 12:39:33 -0400 Subject: [PATCH 2/2] formatting fix --- R/makeMapping.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/makeMapping.R b/R/makeMapping.R index e84b0bf5..1ae554a3 100644 --- a/R/makeMapping.R +++ b/R/makeMapping.R @@ -27,7 +27,8 @@ makeMapping <- function(domainData, meta, autoMapping, customMapping ){ }else{ return(standard$mapping) } - }) auto_mapping_df<-bind_rows(auto_mapping_list, .id = "domain") %>% select(-.data$valid) + }) + auto_mapping_df<-bind_rows(auto_mapping_list, .id = "domain") %>% select(-.data$valid) }else{ # otherwise initialize NULL standards/mapping standards<-NULL