refactor: add function to create species string #126

pfmc-assessments · Apr 4, 2024 · e949cb4 · e949cb4
1 parent 26f89a9
commit e949cb4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/R/pull_bio.R b/R/pull_bio.R
@@ -88,12 +88,7 @@ pull_bio <- function(common_name = NULL,
   )
 
   # symbols here are generally: %22 = ", %2C = ",", %20 = " "
-  species_str <- paste0("%22",stringr::str_replace_all(species[1]," ","%20"),"%22")
-  if(length(species) > 1) {
-    for(i in 2:length(species)) {
-      species_str <- paste0(species_str, "%2C", paste0("%22",stringr::str_replace_all(species[i]," ","%20"),"%22"))
-    }
-  }
+  species_str <- convert_to_hex_string(species)
   add_species <- paste0("field_identified_taxonomy_dim$", var_name, "|=[", species_str,"]")
 
   if (any(species == "pull all")) {

diff --git a/R/pull_biological_samples.R b/R/pull_biological_samples.R
@@ -52,12 +52,7 @@ pull_biological_samples <- function(common_name = NULL,
   }
 
   # symbols here are generally: %22 = ", %2C = ",", %20 = " "
-  species_str <- paste0("%22",stringr::str_replace_all(species[1]," ","%20"),"%22")
-  if(length(species) > 1) {
-    for(i in 2:length(species)) {
-      species_str <- paste0(species_str, "%2C", paste0("%22",stringr::str_replace_all(species[i]," ","%20"),"%22"))
-    }
-  }
+  species_str <- convert_to_hex_string(species)
   add_species <- paste0("field_identified_taxonomy_dim$", var_name, "|=[", species_str,"]")
 
   if (any(species == "pull all")) {

diff --git a/R/pull_catch.R b/R/pull_catch.R
@@ -115,17 +115,7 @@ pull_catch <- function(common_name = NULL,
   vars_short <- vars_long[!vars_long %in% perf_codes]
 
   # symbols here are generally: %22 = ", %2C = ",", %20 = " "
-  species_str <- paste0(
-    "%22",stringr::str_replace_all(species[1]," ","%20"),"%22"
-  )
-
-  if(length(species) > 1) {
-    for(i in 2:length(species)) {
-      species_str <- paste0(
-        species_str, "%2C", paste0(
-        "%22",stringr::str_replace_all(species[i]," ","%20"),"%22"))
-    }
-  }
+  species_str <- convert_to_hex_string(species)
   add_species <- paste0("field_identified_taxonomy_dim$", var_name, "|=[", species_str,"]")
 
   if (any(species == "pull all")) {

diff --git a/man/convert_to_hex_string.Rd b/man/convert_to_hex_string.Rd