use grepl for valid interval

This goes to partially address #67
reconhub · Mar 6, 2019 · b954c50 · b954c50
1 parent b8acf5f
commit b954c50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/R/make_week.R b/R/make_week.R
@@ -25,6 +25,7 @@ get_week_start <- function(weekday) {
                 "iso"  = "monday", # ISOweek == WHO epiweek
                 wkdy # all others
                 )
+  res <- if (res == "") "week" else res
   res <- gsub("epi", "", res) # if they specify something like "epiweek:saturday"
   suppressWarnings(rn <- as.integer(res))
   if (is.na(rn)) res else rn

diff --git a/R/valid_interval.R b/R/valid_interval.R
@@ -6,9 +6,11 @@
 #' @noRd
 #' @keywords internal
 is_date_interval <- function(the_interval) {
-  valid_intervals <- c("day", "week", "month", "quarter", "year",
-                       "days", "weeks", "months", "quarters", "years")
-  the_interval %in% valid_intervals
+  valid_intervals <- "day|week|month|quarter|year"
+  # valid_intervals <- c("day", "week", "month", "quarter", "year",
+  #                      "days", "weeks", "months", "quarters", "years")
+  # the_interval %in% valid_intervals
+  grepl(valid_intervals, the_interval)
 }
 
 #' Validate potential character values for interval