Merge pull request #98 from ropensci/97-cant-manually-specify-cox1-as…

…-database fix b_get_db
ropensci · Jun 13, 2023 · dc46f3b · dc46f3b
2 parents acff4da + c6c9186
commit dc46f3b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/R/utils_assert.R b/R/utils_assert.R
@@ -72,12 +72,14 @@ b_validate <- function(x, choices, name){
   }
 }
 b_get_db <- function(x){
-  x <- tolower(x)
-  if (b_detect(x, '^pub(lic)?$|_public$'))
+  opts <- list(case_insensitive = TRUE)
+  if (b_detect(x, '^COX[1I]$', opts_regex = opts))
+    "COX1"
+  else if (b_detect(x, '^pub(lic)?$|_public$', opts_regex = opts))
     "COX1_SPECIES_PUBLIC"
-  else if (b_detect(x, '^spe(cies)?$|_species$'))
+  else if (b_detect(x, '^spe(cies)?$|_species$', opts_regex = opts))
     "COX1_SPECIES"
-  else if (b_detect(x, '^(cox1_)?(l640)?bp$'))
+  else if (b_detect(x, '^(cox[1I]_)?(l640)?bp$', opts_regex = opts))
     "COX1_L640bp"
   else
     x