Custom .multi for legacy

DOI-USGS · Nov 25, 2024 · 9ce4776 · 9ce4776
1 parent 29ecfcb
commit 9ce4776
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/R/constructNWISURL.R b/R/constructNWISURL.R
@@ -311,9 +311,9 @@ constructWQPURL <- function(siteNumbers,
 
   if(legacy){
     baseURL <- httr2::request(pkg.env[["Result"]])
-    siteNumbers <- paste(siteNumbers, collapse = ";")
     baseURL <- httr2::req_url_query(baseURL,
-                                    siteid = siteNumbers)
+                                    siteid = siteNumbers,
+                                    .multi = function(x) paste0(x, collapse = ";"))
     baseURL <- httr2::req_url_query(baseURL, 
                                     count = "no")
   } else {
@@ -324,13 +324,14 @@ constructWQPURL <- function(siteNumbers,
   }
 
   if(legacy & !allPCode){
-    if (multiplePcodes) {
-      parameterCd <- paste(parameterCd, collapse = ";")
-    }
     if(pCodeLogic){
-      baseURL <- httr2::req_url_query(baseURL, pCode = parameterCd)
+      baseURL <- httr2::req_url_query(baseURL, 
+                                      pCode = parameterCd,
+                                      .multi = function(x) paste0(x, collapse = ";"))
     } else {
-      baseURL <- httr2::req_url_query(baseURL, characteristicName = parameterCd)
+      baseURL <- httr2::req_url_query(baseURL, 
+                                      characteristicName = parameterCd,
+                                      .multi = function(x) paste0(x, collapse = ";"))
     }
 
   } else if(!legacy & !allPCode){

diff --git a/R/readWQPdata.R b/R/readWQPdata.R
@@ -240,9 +240,9 @@ readWQPdata <- function(...,
     if("siteid" %in% names(values)){
       if(length(values[["siteid"]]) > 1){
         sites <- values[["siteid"]]
-        sites <- paste0(sites, collapse = ";")
         baseURL <- httr2::req_url_query(baseURL, 
-                                        siteid = sites)
+                                        siteid = sites,
+                                        .multi = function(x) paste0(x, collapse = ";"))
         values <- values[names(values) != "siteid"]
       }
     }

diff --git a/R/whatWQPdata.R b/R/whatWQPdata.R
@@ -43,9 +43,9 @@ whatWQPsamples <- function(...,
     if("siteid" %in% names(values)){
       if(length(values[["siteid"]]) > 1){
         sites <- values[["siteid"]]
-        sites <- paste0(sites, collapse = ";")
         baseURL <- httr2::req_url_query(baseURL, 
-                                        siteid = sites)
+                                        siteid = sites,
+                                        .multi = function(x) paste0(x, collapse = ";"))
         values <- values[names(values) != "siteid"]
       }
     }
@@ -103,9 +103,9 @@ whatWQPmetrics <- function(...,
   if("siteid" %in% names(values)){
     if(length(values[["siteid"]]) > 1){
       sites <- values[["siteid"]]
-      sites <- paste0(sites, collapse = ";")
       baseURL <- httr2::req_url_query(baseURL, 
-                                      siteid = sites)
+                                      siteid = sites,
+                                      .multi = function(x) paste0(x, collapse = ";"))
       values <- values[names(values) != "siteid"]
     }
   }
@@ -203,9 +203,9 @@ whatWQPdata <- function(...,
   if("siteid" %in% names(values)){
     if(length(values[["siteid"]]) > 1){
       sites <- values[["siteid"]]
-      sites <- paste0(sites, collapse = ";")
       baseURL <- httr2::req_url_query(baseURL, 
-                                      siteid = sites)
+                                      siteid = sites,
+                                      .multi = function(x) paste0(x, collapse = ";"))
       values <- values[names(values) != "siteid"]
     }
   }

diff --git a/R/whatWQPsites.R b/R/whatWQPsites.R
@@ -59,9 +59,9 @@ whatWQPsites <- function(..., legacy = TRUE, convertType = TRUE) {
     if("siteid" %in% names(values)){
       if(length(values[["siteid"]]) > 1){
         sites <- values[["siteid"]]
-        sites <- paste0(sites, collapse = ";")
         baseURL <- httr2::req_url_query(baseURL, 
-                                        siteid = sites)
+                                        siteid = sites,
+                                        .multi = function(x) paste0(x, collapse = ";"))
         values <- values[names(values) != "siteid"]
       }
     }
@@ -162,9 +162,9 @@ readWQPsummary <- function(...) {
 
   if(length(values[["siteid"]]) > 1){
     sites <- values[["siteid"]]
-    sites <- paste0(sites, collapse = ";")
     baseURL <- httr2::req_url_query(baseURL, 
-                                    siteid = sites)
+                                    siteid = sites,
+                                    .multi = function(x) paste0(x, collapse = ";"))
     values <- values[names(values) != "siteid"]
   }