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

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

Author: romain
Date: 2009-04-15 14:57:25 +0200 (Wed, 15 Apr 2009)
New Revision: 75

Modified:
   pkg/zooimage/R/ZIClass.r
   pkg/zooimage/R/zid.r
Log:
typo

Modified: pkg/zooimage/R/ZIClass.r
===================================================================
--- pkg/zooimage/R/ZIClass.r	2009-04-15 12:32:06 UTC (rev 74)
+++ pkg/zooimage/R/ZIClass.r	2009-04-15 12:57:25 UTC (rev 75)
@@ -361,7 +361,7 @@
 # {{{ predict.lvq
 "predict.lvq" <- function(object, newdata, type = "class", ...) {
    	mustbe( object, "lvq" )
-	require(class) || stop("package 'class' is required!"))
+	require(class) || stop("package 'class' is required!")
     if (missing(newdata)) {
 		newdata <- object$data
 	}

Modified: pkg/zooimage/R/zid.r
===================================================================
--- pkg/zooimage/R/zid.r	2009-04-15 12:32:06 UTC (rev 74)
+++ pkg/zooimage/R/zid.r	2009-04-15 12:57:25 UTC (rev 75)
@@ -28,17 +28,17 @@
 	# {{{ check the format of the file
 	# This should be a directory containing XXX+YY_dat1.zim files + .jpg files
 	if (type != "ZI1") {
-	  stop("only 'ZI1' is currently supported for 'type'!")
+		stop("only 'ZI1' is currently supported for 'type'!")
 	}
 	# }}}
 	
 	# {{{ check the list of _dat1.zim
 	dat1files <- list.dat1.zim(zidir)
 	if(length(dat1files) == 0) {
-		stop( sprintf( "%s - has no '_dat1.zim' file!", zidir) )
+		stop( "no '_dat1.zim' file!" )
 	}
 	if (length(dat1files) == 1 && is.na(dat1files)) {
-	 	stop( sprintf( "%s - not found or not a directory!", zidir ) )
+	 	stop( "not found or not a directory!" )
 	}
 	# }}}
 	
@@ -49,8 +49,7 @@
 	nitems <- rep( -1, length(dat1files) )	 
 	for (i in 1:length(dat1files)) {
 		
-		# this might generate an error, which is dealt with
-		# in the catcher associated with this function
+		# this might generate, which we need to handle somehow
 		res <- verify.zim(file.path(zidir, dat1files[i]), is.dat1 = TRUE)
 		if( length( res ) ){
 			nitems[i] <- res
@@ -526,9 +525,9 @@
 
 # {{{ uncompress.zid.all
 # Uncompress all .zid files in the 'path.extract' directory
-"uncompress.zid.all" <-
-	function(path = ".", zidfiles = list.zid(path),
-	path.extract = path, skip.existing.dirs = TRUE, delete.source = FALSE, show.log = TRUE, bell = FALSE) {
+"uncompress.zid.all" <- function(path = ".", zidfiles = list.zid(path),
+	path.extract = path, skip.existing.dirs = TRUE, 
+	delete.source = FALSE, show.log = TRUE, bell = FALSE) {
 	
 	# {{{ initial checks
 	if (is.null(zidfiles) || length(zidfiles) == 0) {