[Zooimage-commits] r165 - pkg/zooimage/R

[noreply at r-forge.r-project.org]

Author: romain
Date: 2009-06-04 11:55:56 +0200 (Thu, 04 Jun 2009)
New Revision: 165

Modified:
   pkg/zooimage/R/zid.r
   pkg/zooimage/R/zie.r
   pkg/zooimage/R/zis.r
Log:
 [bug] calling checkFileExists with named message argument

Modified: pkg/zooimage/R/zid.r
===================================================================
--- pkg/zooimage/R/zid.r	2009-06-04 09:54:35 UTC (rev 164)
+++ pkg/zooimage/R/zid.r	2009-06-04 09:55:56 UTC (rev 165)
@@ -558,7 +558,7 @@
 	sample      <- noext(basename(zidfile))
 	RdataFile   <- paste(sample, "_dat1.RData", sep ="")
 	deletefile  <- FALSE
-	checkFileExists( zidfile, "%s not found!" )
+	checkFileExists( zidfile, message = "%s not found!" )
 	# }}}
 	
 	# {{{ treat different kind of files
@@ -570,7 +570,7 @@
 			if (!file.exists(rdata)) {
 				# Try to create it
 				make.RData(zidfile, show.log = FALSE)
-				checkFileExists( rdata, "Error creating the .RData file")
+				checkFileExists( rdata, message = "Error creating the .RData file")
 			}
 		} else stop( sprintf( "Unrecognized file: %s", zidfile) )
 		# }}}

Modified: pkg/zooimage/R/zie.r
===================================================================
--- pkg/zooimage/R/zie.r	2009-06-04 09:54:35 UTC (rev 164)
+++ pkg/zooimage/R/zie.r	2009-06-04 09:55:56 UTC (rev 165)
@@ -902,7 +902,7 @@
 #' checkBF("test.tif")
 "checkBF" <- function(BFfile) {
 	
-	checkFileExists( BFfile, "Blank-field file '%s' not found!")
+	checkFileExists( BFfile, message = "Blank-field file '%s' not found!")
 
 	# Is it a test file?
 	if (isTestFile(BFfile)){

Modified: pkg/zooimage/R/zis.r
===================================================================
--- pkg/zooimage/R/zis.r	2009-06-04 09:54:35 UTC (rev 164)
+++ pkg/zooimage/R/zis.r	2009-06-04 09:55:56 UTC (rev 165)
@@ -122,7 +122,7 @@
 		if (zisfile == "")
 			return(invisible())
 	} else {
-		checkFileExists( zisfile, "the file '%s' is not found!",
+		checkFileExists( zisfile, message = "the file '%s' is not found!",
 			extension = "zis" )
 	}
 	editor( zisfile, editor = editor )