Merge pull request #222 from CHOP-CGTInformatics/fix-extra_field_values-warning

ezraporter · web-flow · commit 1a6ddf8ac2a9 · 2025-05-20T12:57:07.000-04:00
Fix `check_extra_field_values` assignment
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: REDCapTidieR
 Type: Package
 Title: Extract 'REDCap' Databases into Tidy 'Tibble's
-Version: 1.2.2
+Version: 1.2.2.9000
 Authors@R: c(
     person("Richard", "Hanna", , "hannar1@chop.edu", role = c("aut", "cre"),
            comment = c(ORCID = "0009-0005-6496-8154")),
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,5 @@
+# REDCapTidieR (development version)
+
 # REDCapTidieR 1.2.2
 
 - Fixed a bug where, when using `raw_or_label = "label"` and requesting DAGs, only raw values for DAGs would be retrieved
diff --git a/R/utils.R b/R/utils.R
@@ -495,10 +495,14 @@ multi_choice_to_labels <- function(db_data, db_metadata, raw_or_label = "label",
       )
 
       if (!getOption("redcaptidier.allow.mdc", FALSE)) {
-        extra_field_values[i] <- check_extra_field_values(
+        check_extra_field_values_res <- check_extra_field_values(
           db_data[[field_name]],
           names(parse_labels_output)
         )
+
+        if (!is.null(check_extra_field_values_res)) {
+          extra_field_values[i] <- check_extra_field_values_res
+        }
       }
 
       # Replace values from db_data$(field_name) with label values from

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# REDCapTidieR (development version)`
	`2`	`+`
`1`	`3`	`# REDCapTidieR 1.2.2`
`2`	`4`
`3`	`5`	- Fixed a bug where, when using `raw_or_label = "label"` and requesting DAGs, only raw values for DAGs would be retrieved
Original file line number	Diff line number	Diff line change
`@@ -495,10 +495,14 @@ multi_choice_to_labels <- function(db_data, db_metadata, raw_or_label = "label",`
`495`	`495`	`)`
`496`	`496`
`497`	`497`	`if (!getOption("redcaptidier.allow.mdc", FALSE)) {`
`498`		`- extra_field_values[i] <- check_extra_field_values(`
	`498`	`+ check_extra_field_values_res <- check_extra_field_values(`
`499`	`499`	`db_data[[field_name]],`
`500`	`500`	`names(parse_labels_output)`
`501`	`501`	`)`
	`502`	`+`
	`503`	`+ if (!is.null(check_extra_field_values_res)) {`
	`504`	`+ extra_field_values[i] <- check_extra_field_values_res`
	`505`	`+ }`
`502`	`506`	`}`
`503`	`507`
`504`	`508`	`# Replace values from db_data$(field_name) with label values from`