Fixed bug in castForImport drops #331

vubiostat · Mar 25, 2024 · 3684d51 · 3684d51
1 parent 441e489
commit 3684d51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/R/fieldCastingFunctions.R b/R/fieldCastingFunctions.R
@@ -299,14 +299,15 @@ castForImport <- function(data,
     data   <- data[,!mchoices, drop=FALSE]
     fields <- fields[!mchoices]
   }
-  
+
   # Drop non importable field types
   for(type in c("file", "calc"))
   {
     drops <- rcon$metadata()[match(fields, rcon$metadata()$field_name),'field_type'] == type
-    if(!is.na(sum(drops)) && sum(drops) > 0)
+    drops[is.na(drops)] <- FALSE
+    if(sum(drops) > 0)
     {
-      message(paste0("The following ", type, ", variables(s) were dropped: ",
+      message(paste0("The following ", type, " variables(s) were dropped: ",
                      paste0(fields[drops], collapse=', '), '.'))
       data   <- data[,!drops, drop=FALSE]
       fields <- fields[!drops]

diff --git a/tests/testthat/test-201-exportTypedRecords-withDAGs.R b/tests/testthat/test-201-exportTypedRecords-withDAGs.R
@@ -7,6 +7,7 @@ ImportData <- exportRecordsTyped(rcon,
                                  cast = raw_cast)
 ImportData <- castForImport(ImportData, 
                             rcon, 
+                            validation = list(bioportal=valSkip),
                             cast = list(number_1dp = as.numeric, 
                                         number_2dp = as.numeric, 
                                         number_1dp_comma_decimal = as.numeric,