Merge remote-tracking branch 'Upstream/master'

R/data_access.R

@@ -15,6 +15,8 @@ SDrivePaths <- function(ver = 2, prefix = NA) {
       stop("Please specify the prefix for S Drive data, e.g. \"S:/MNHS-SPHPM-EPM/ASPREE-Data/ASPREE Longitudinal Data Set/\"")
     }
   }
+
+  prefixF2_DMC <- Sys.glob(file.path(prefix, "ASPREE-Data", "ASPREE Longitudinal Data Set", "Drafts", "Version2"))
   prefix <- Sys.glob(file.path(prefix, "ASPREE-Data", "ASPREE Longitudinal Data Set", "LOCKED", "ASPREE Longitudinal Data Set Version*"))
   prefix <- prefix[file.info(prefix)$isdir]
   common_prefix <- suppressWarnings(
@@ -59,7 +61,7 @@ SDrivePaths <- function(ver = 2, prefix = NA) {
     SectionG1 = Sys.glob(file.path(prefix, "CSV*", "SectionG1_*.csv")),
     SectionG2 = Sys.glob(file.path(prefix, "CSV*", "SectionG2_*.csv")),
     SectionH1 = Sys.glob(file.path(prefix, "CSV*", "SectionH1_*.csv")),
-    SectionF2_DMC = Sys.glob(file.path(prefix, "Stata*", "SectionF2_*.dta"))
+    SectionF2_DMC = Sys.glob(file.path(prefixF2_DMC, "SectionF2_*.dta"))
   )
   if (!all(lapply(paths, length) == 1)) {
     warning("Some sections not found!")