Merge pull request #301 from ThiesDS/hotfix/keyword_encoding

PMassicotte · web-flow · commit d898efdf5b59 · 2019-05-02T10:05:11.000-04:00
Bug fix keyword encoding when there are multiple keywords with '&amp;'
diff --git a/R/zzz.R b/R/zzz.R
@@ -424,6 +424,10 @@ na.omit.list <- function(y) {
 
 ## Replace special characters in keywords like P&500 -> P%26500 
 encode_keyword <- function(url) {
+  url <- gsub("(?:\\G(?!^)|\\[\\s*)[^][\\s]*\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)
+  url <- gsub("(?:\\G(?!^)|\\[\\s*)[^][\\s]*\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)
+  url <- gsub("(?:\\G(?!^)|\\[\\s*)[^][\\s]*\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)
+  url <- gsub("(?:\\G(?!^)|\\[\\s*)[^][\\s]*\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)
   gsub("(?:\\G(?!^)|\\[\\s*)[^][\\s]*\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,10 @@ na.omit.list <- function(y) {`
`424`	`424`
`425`	`425`	`## Replace special characters in keywords like P&500 -> P%26500`
`426`	`426`	`encode_keyword <- function(url) {`
	`427`	`+ url <- gsub("(?:\\G(?!^)\|\\[\\s)[^][\\s]\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)`
	`428`	`+ url <- gsub("(?:\\G(?!^)\|\\[\\s)[^][\\s]\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)`
	`429`	`+ url <- gsub("(?:\\G(?!^)\|\\[\\s)[^][\\s]\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)`
	`430`	`+ url <- gsub("(?:\\G(?!^)\|\\[\\s)[^][\\s]\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)`
`427`	`431`	`gsub("(?:\\G(?!^)\|\\[\\s)[^][\\s]\\K\\&(?!])(?=[^][]*])", "%26", url, perl = TRUE)`
`428`	`432`	`}`
`429`	`433`