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

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

Author: romain
Date: 2009-04-15 11:32:43 +0200 (Wed, 15 Apr 2009)
New Revision: 64

Modified:
   pkg/zooimage/R/zid.r
   pkg/zooimage/R/zim.r
Log:
unsing list.zid, list.zip

Modified: pkg/zooimage/R/zid.r
===================================================================
--- pkg/zooimage/R/zid.r	2009-04-15 09:29:05 UTC (rev 63)
+++ pkg/zooimage/R/zid.r	2009-04-15 09:32:43 UTC (rev 64)
@@ -478,7 +478,7 @@
 	# }}}
     
 	# {{{ identify paths
-	zimfiles <- list.files(path = ".", pattern = "[.][zZ][iI][mM]$")
+	zimfiles <- list.zim(path = "." )
     zimsamples <- sub("^(.*)[+].+", "\\1", zimfiles)
 	# }}}
 	
@@ -533,7 +533,7 @@
 # {{{ uncompress.zid.all
 # Uncompress all .zid files in the 'path.extract' directory
 "uncompress.zid.all" <-
-	function(path = ".", zidfiles = list.files(path = path, pattern = "^.*[.][zZ][iI][dD]"),
+	function(path = ".", zidfiles = list.zid(path),
 	path.extract = path, skip.existing.dirs = TRUE, delete.source = FALSE, show.log = TRUE, bell = FALSE) {
 	
 	# {{{ initial checks

Modified: pkg/zooimage/R/zim.r
===================================================================
--- pkg/zooimage/R/zim.r	2009-04-15 09:29:05 UTC (rev 63)
+++ pkg/zooimage/R/zim.r	2009-04-15 09:32:43 UTC (rev 64)
@@ -260,6 +260,9 @@
 list.zip <- function( zidir, ... ){
 	list.files.ext( zidir, extension = "zip", ... )
 }
+list.zid <- function( zidir, ... ){
+	list.files.ext( zidir, extension = "zid", ... )
+}
 # }}}
 
 # {{{ extract.zims