Mercurial > repos > lecorguille > camera_annotate
changeset 29:59bdfc862408 draft
planemo upload commit 00bda51a5454373957a0b75024d9fc4282743c4d
author | lecorguille |
---|---|
date | Thu, 30 Mar 2017 09:02:20 -0400 |
parents | 591d26b9027e |
children | fce12d692a41 |
files | CAMERA.r lib.r |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CAMERA.r Tue Mar 28 10:51:29 2017 -0400 +++ b/CAMERA.r Thu Mar 30 09:02:20 2017 -0400 @@ -100,7 +100,9 @@ # We unzip automatically the chromatograms from the zip files. if (thefunction %in% c("annotatediff")) { - rawFilePath = getRawfilePathFromArguments(listArguments) + if (!exists("zipfile")) zipfile=NULL + if (!exists("singlefile")) singlefile=NULL + rawFilePath = getRawfilePathFromArguments(singlefile, zipfile, listArguments) zipfile = rawFilePath$zipfile singlefile = rawFilePath$singlefile listArguments = rawFilePath$listArguments
--- a/lib.r Tue Mar 28 10:51:29 2017 -0400 +++ b/lib.r Thu Mar 30 09:02:20 2017 -0400 @@ -225,9 +225,7 @@ } # This function get the raw file path from the arguments -getRawfilePathFromArguments <- function(listArguments) { - zipfile = NULL - singlefile = NULL +getRawfilePathFromArguments <- function(singlefile, zipfile, listArguments) { if (!is.null(listArguments[["zipfile"]])) zipfile = listArguments[["zipfile"]] if (!is.null(listArguments[["zipfilePositive"]])) zipfile = listArguments[["zipfilePositive"]] if (!is.null(listArguments[["zipfileNegative"]])) zipfile = listArguments[["zipfileNegative"]]