Merge pull request #35 from explodecomputer/save-fix

Save function fix
-fixed save function
-now makes the dictionary and saves to
(1) /data
and (2) /inst/data (used for dev purposed without full install, removed after install)
Writes the same copy to both locations, no confusion over versions

Author: stxmjh

R/dictionary.r

@@ -52,13 +52,13 @@ retrieveDictionary <- function(name) {
 }
 
 saveDictionary <- function(name, dictionary) {
-  # Save in the globals environment
+# Save in the globals environment
   assign(name, dictionary, globals)
 
   # -------------------------------
   # 1️⃣ Save CRAN/GitHub-compliant copy (/data/)
   # -------------------------------
-  data_path <- file.path(system.file(package = "alspac"), "data")
+  data_path <- file.path(getwd(), "data")  # always dev source tree
   if (!dir.exists(data_path)) dir.create(data_path, recursive = TRUE)
 
   save(list = name,
@@ -68,7 +68,7 @@ saveDictionary <- function(name, dictionary) {
   # -------------------------------
   # 2️⃣ Save dev copy (/inst/data/) for load_all() testing
   # -------------------------------
-  inst_path <- file.path(getwd(), "inst", "data")  # relative to project root
+  inst_path <- file.path(getwd(), "inst", "data")
   if (!dir.exists(inst_path)) dir.create(inst_path, recursive = TRUE)
 
   save(list = name,
@@ -148,7 +148,7 @@ createDictionary <- function(datadir="Current", name= "current", quick=FALSE, so
   alspacdir <- options()$alspac_data_dir
   datadir <- file.path(alspacdir, datadir)
 
-  # --- NEW list.files section with version handling ---
+# ---list.files section with version handling ---
   files <- list.files(datadir,  
                       pattern="dta$",
                       full.names=TRUE,
@@ -163,7 +163,7 @@ createDictionary <- function(datadir="Current", name= "current", quick=FALSE, so
   num <- suppressWarnings(as.integer(sub("([0-9]+).*", "\\1", vers)))
   let <- sub("[0-9]+", "", vers)
 
-  # Build table of file info
+# Build table of file info
   file_info <- data.frame(
     file = files,
     base = base,
@@ -177,7 +177,7 @@ createDictionary <- function(datadir="Current", name= "current", quick=FALSE, so
     dplyr::arrange(dplyr::desc(num), dplyr::desc(let)) |>
     dplyr::slice_head(n = 1) |>
     dplyr::pull(file)
-  # --- END of new section ---
+# --- END of new section ---
 
   dictionary <- parallel::mclapply(latest_files, function(file) {
     cat(date(), "loading", file, "\n")
@@ -202,7 +202,7 @@ createDictionary <- function(datadir="Current", name= "current", quick=FALSE, so
   ## Assign in globals so retrieveDictionary() can find it
   assign(name, dictionary, globals)
 
-  ## Save using your robust saveDictionary() function
+  ## Save using saveDictionary() function
   saveDictionary(name, dictionary)
 
   invisible(dictionary)