Merge pull request loosolab#35 from HendrikSchultheis/orTextual_searc…

…h_bug Or textual search bug
HendrikSchultheis · Jun 25, 2019 · 3761ba5 · 3761ba5
2 parents 82ce2c3 + edf5ce7
commit 3761ba5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: wilson
 Type: Package
 Title: Web-Based Interactive Omics Visualization
-Version: 2.2.0
+Version: 2.2.1
 Authors@R: c(
     person("Hendrik", "Schultheis", email = "hendrik.schultheis@mpi-bn.mpg.de", role = c("aut", "cre")),
     person("Jens", "Preussner", email = "jens.preussner@mpi-bn.mpg.de", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,5 @@
+# wilson 2.2.1
+- fixed orTextual selection bug
 # wilson 2.2.0
 - export plotting functions
 # wilson 2.1.1

diff --git a/R/orTextual.R b/R/orTextual.R
@@ -104,7 +104,8 @@ orTextual <- function(input, output, session, choices, selected = NULL, label =
       esc_choices <- paste0("\\Q", input$column, "\\E")
 
       if (contains | !is.null(delimiter)) {
-        result <- grepl(pattern = paste0(esc_choices, paste0("($|", delimiter, ")"), collapse = "|"), raw_choices, perl = TRUE)
+        print(paste0(paste0("(^|", delimiter, ")"), esc_choices, paste0("($|", delimiter, ")"), collapse = "|"))
+        result <- grepl(pattern = paste0(paste0("(^|", delimiter, ")"), esc_choices, paste0("($|", delimiter, ")"), collapse = "|"), raw_choices, perl = TRUE)
       } else {
         result <- grepl(pattern = paste0("^(", esc_choices, ")$", collapse = "|"), raw_choices, perl = TRUE)
       }