Merge pull request #100 from aim-rsf/fix-bug

Fix bug with header of demo list file
aim-rsf · Jul 1, 2024 · bf11546 · bf11546
2 parents 69062ab + 41c93fa
commit bf11546
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/R/data-domain_list.R b/R/data-domain_list.R
@@ -3,7 +3,7 @@
 #' A simplified list of domains, to demo the function domain_mapping.R \cr \cr
 #' This data was created with these two steps:
 #' \enumerate{
-#'  \item \code{domain_list <- read.csv('browseMetadata/data-raw/domain_list_demo.csv')}
+#'  \item \code{domain_list <- read.csv('browseMetadata/data-raw/domain_list_demo.csv',header=FALSE)}
 #'  \item \code{usethis::use_data(domain_list)}
 #' }
 #' @docType data

diff --git a/R/domain_mapping.R b/R/domain_mapping.R
@@ -43,7 +43,6 @@ domain_mapping <- function(json_file = NULL, domain_file = NULL, look_up_file =
     meta_json <- rjson::fromJSON(file = json_file)
     # Read in the domain file containing the meta data
     domains <- read.csv(domain_file, header = FALSE)
-    colnames(domains)[1] = "Domain Name"
     DomainListDesc <- tools::file_path_sans_ext(basename(domain_file))
   }
 
@@ -59,6 +58,7 @@ domain_mapping <- function(json_file = NULL, domain_file = NULL, look_up_file =
     }
 
   ## Present domains plots panel for user's reference ----
+  colnames(domains)[1] = "Domain Name"
   graphics::plot.new()
   domains_extend <- rbind(c("*NO MATCH / UNSURE*"), c("*METADATA*"), c("*ALF ID*"), c("*OTHER ID*"), c("*DEMOGRAPHICS*"), domains)
   Code <- data.frame(Code = 0:(nrow(domains_extend) - 1))

diff --git a/data-raw/domain_list_demo.csv b/data-raw/domain_list_demo.csv
@@ -1,4 +1,3 @@
-Domain_Name
 "Socioeconomic info"
 "Location info"
 "Education info"

diff --git a/data/domain_list.rda b/data/domain_list.rda
diff --git a/man/domain_list.Rd b/man/domain_list.Rd