Merge pull request #225 from MoTrPAC/adjust/details

Minor adjustment: new assays, fix package conflicts
MoTrPAC · Feb 2, 2024 · fa4c690 · fa4c690
2 parents d916a28 + 5d268be
commit fa4c690
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -63,7 +63,6 @@ import(progress)
 import(purrr)
 import(stringr)
 import(tidyr)
-import(utils)
 import(viridis)
 importFrom(data.table,as.data.table)
 importFrom(data.table,fread)
@@ -81,3 +80,7 @@ importFrom(readr,read_lines)
 importFrom(scales,percent)
 importFrom(stats,median)
 importFrom(stats,reorder)
+importFrom(utils,URLencode)
+importFrom(utils,read.csv)
+importFrom(utils,read.delim)
+importFrom(utils,write.table)
diff --git a/R/misc.R b/R/misc.R
@@ -19,7 +19,7 @@
 #' @importFrom stats median reorder
 #' @import stringr
 #' @import tidyr
-#' @import utils
+#' @importFrom utils URLencode read.csv read.delim write.table
 #' @import viridis
 #____________________________________________________________________________
 

diff --git a/R/olink_qc.R b/R/olink_qc.R
@@ -1010,7 +1010,7 @@ write_olink_releases <- function(input_results_folder,
     phase_folder_release <- phase_details
   }
 
-  output_folder <- file.path(folder_root, folder_name, phase_folder_release, "prot-ol", folder_tissue, folder_assay)
+  output_folder <- file.path(folder_root, folder_name, phase_folder_release, "proteomics-targeted", folder_tissue, folder_assay)
 
   if(!dir.exists(file.path(output_folder))){
     dir.create(file.path(output_folder), recursive = TRUE)

diff --git a/R/validations.R b/R/validations.R
@@ -254,7 +254,7 @@ check_viallabel_dmaqc <- function(vl_submitted,
 validate_assay <- function(input_results_folder){
 
   assay <- stringr::str_extract(string = input_results_folder,
-                                pattern = "(?<=T\\d{2}/)(IONPNEG|RPNEG|RPPOS|HILICPOS|LRPPOS|LRPNEG|3HIB|AA|AC_DUKE|ACOA|BAIBA|CER_DUKE|CONV|KA|NUC|OA|SPHM|OXYLIPNEG|ETAMIDPOS|AC_MAYO|AMINES|CER_MAYO|TCA|IMM_CRT|IMM_GLC|IMM_INS|PROT_PH|PROT_PR|PROT_AC|PROT_UB|PROT_OL)")
+                                pattern = "(?<=T\\d{2}/)(IONPNEG|RPNEG|RPPOS|HILICPOS|LRPPOS|LRPNEG|3HIB|AA|AC_DUKE|ACOA|BAIBA|CER_DUKE|CONV|KA|NUC|OA|SPHM|OXYLIPNEG|ETAMIDPOS|AC_MAYO|AMINES|CER_MAYO|TCA|IMM_CRT|IMM_GLC|IMM_INS|PROT_PH|PROT_PR|PROT_AC|PROT_UB|PROT_OL|PROT_OX)")
   if(is.na(assay)){
     stop("ASSAY not found in the folder structure")
   }else{