Merge pull request #2 from nationalparkservice/bug-fix

Fix issue where file doesn't read if there is only one Date column
nationalparkservice · May 22, 2024 · 54d7ea4 · 54d7ea4
2 parents 551f579 + e556b5b
commit 54d7ea4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 .RData
 .Ruserdata
 docs
+*.xlsx
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -24,5 +24,5 @@ Imports:
     tidyr,
     tidyxl
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.3.1
 URL: https://nationalparkservice.github.io/imd-ccal/
diff --git a/R/read_write.R b/R/read_write.R
@@ -113,7 +113,7 @@ getCCALData <- function(files) {
     # Extract chem results
     data <- suppressMessages(readxl::read_excel(file, sheet = 2, skip = 3, col_names = TRUE))
     first_chem_col <- max(grep("delivery\\s*date", names(data), ignore.case = TRUE), grep("date\\s*filtered", names(data), ignore.case = TRUE)) + 1  # Get index of first chem data column
-    last_date_col <- max(grep("^date\\.\\.\\.\\d+$", names(data), ignore.case = TRUE))
+    last_date_col <- max(grep("^date(\\.\\.\\.\\d+){0,1}$", names(data), ignore.case = TRUE))
     names(data) <- trimws(names(data))
     data <- data %>%
       tidyr::pivot_longer(first_chem_col:last_date_col, names_to = "param") %>%
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     .RData
     .Ruserdata
     docs
+    *.xlsx