Mercurial > repos > mmonsoor > probmetab

diff probmetab.r @ 4:a1b528cba999 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload commit 50069e075172852530c906581eb4497e733127b6
author lecorguille
date Thu, 06 Apr 2017 05:26:35 -0400
parents f24b9c360a60
children 1dd90aa7815d
line wrap: on
line diff
--- a/probmetab.r	Wed Feb 15 11:45:26 2017 -0500
+++ b/probmetab.r	Thu Apr 06 05:26:35 2017 -0400
@@ -42,7 +42,9 @@
     print(xa)
 
     source_local("lib.r")
-    rawFilePath = getRawfilePathFromArguments(listArguments)
+    if (!exists("zipfile")) zipfile=NULL
+    if (!exists("singlefile")) singlefile=NULL
+    rawFilePath = getRawfilePathFromArguments(singlefile, zipfile, listArguments)
     zipfile = rawFilePath$zipfile
     singlefile = rawFilePath$singlefile
     retrieveRawfileInTheWorkingDirectory(singlefile, zipfile)
@@ -63,7 +65,9 @@
     else variableMetadataP = variableMetadata
 
     source_local("lib.r")
-    rawFilePath = getRawfilePathFromArguments(listArguments)
+    if (!exists("zipfile")) zipfile=NULL
+    if (!exists("singlefile")) singlefile=NULL
+    rawFilePath = getRawfilePathFromArguments(singlefile, zipfile, listArguments)
     zipfilePos = rawFilePath$zipfile
     singlefilePos = rawFilePath$singlefile
     retrieveRawfileInTheWorkingDirectory(singlefilePos, zipfilePos)
@@ -80,7 +84,9 @@
     else variableMetadataN = variableMetadata
 
     source_local("lib.r")
-    rawFilePath = getRawfilePathFromArguments(listArguments)
+    if (!exists("zipfile")) zipfile=NULL
+    if (!exists("singlefile")) singlefile=NULL
+    rawFilePath = getRawfilePathFromArguments(singlefile, zipfile, listArguments)
     zipfileNeg = rawFilePath$zipfile
     singlefileNeg = rawFilePath$singlefile
     retrieveRawfileInTheWorkingDirectory(singlefileNeg, zipfileNeg)