Added decimal separator; Bumped version

loosolab · Jun 12, 2020 · b70b4ef · b70b4ef
1 parent 3632bd2
commit b70b4ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/wilson-basic/.Renviron.j2 b/wilson-basic/.Renviron.j2
@@ -9,3 +9,6 @@ WILSON_MAINPANELWIDTH={{ "WILSON_MAINPANELWIDTH"|env("10") }}
 
 # Remove examples from data source
 WILSON_BLACKLIST_EXAMPLES={{ "WILSON_BLACKLIST_EXAMPLES"|env("false") }}
+
+# Specify separator for decimals during parsing
+WILSON_SEPARATE_DECIMALS={{ "WILSON_SEPARATE_DECIMALS"|env(".") }}
diff --git a/wilson-basic/app.R b/wilson-basic/app.R
@@ -12,7 +12,7 @@ if (!requireNamespace("pacman", quietly = TRUE)) {
 pacman::p_load(char = dependencies)
 
 # Set versions
-wilson_app_version <- "WIlsON basic 2.1.1"
+wilson_app_version <- "WIlsON basic 2.1.2"
 wilson_package_version <- as.character(packageVersion("wilson"))
 
 #
@@ -63,6 +63,11 @@ wilson_log_upload <- TRUE
 example_files <- c("A_RNAseq_Zhang_2015.se", "B_Methylation_Hautefort_Oncot_2017.se", "C_Proteomics_Worzfeld_MCP_2017.se")
 wilson_blacklist_examples <- as.logical(Sys.getenv("WILSON_BLACKLIST_EXAMPLES", unset = FALSE))
 
+#
+# Data options
+#
+wilson_separate_decimals <- Sys.getenv("WILSON_SEPARATE_DECIMALS", unset = ".")
+
 #
 # WIlsON application logic
 #
@@ -596,7 +601,7 @@ server <- function(session, input, output) {
   parsed <- reactive({
     shiny::req(file_path())
 
-    file <- try(parser(file_path()$path))
+    file <- try(parser(file_path()$path, dec = wilson_separate_decimals))
 
     if (!isTruthy(file)) {
       error(logger, paste("Couldn't parse", file_path()$name, file))