r-gregmisc-users

[R-gregmisc-users] SF.net SVN: r-gregmisc: [1268] trunk/gdata/R/read.xls.R

[<wa...@us...>]

Revision: 1268
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1268&view=rev
Author:   warnes
Date:     2008-05-12 19:55:45 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Modifed read.xls() failed to return the converted data... fixed.

Modified Paths:
--------------
    trunk/gdata/R/read.xls.R

Modified: trunk/gdata/R/read.xls.R
===================================================================
--- trunk/gdata/R/read.xls.R	2008-05-13 02:47:18 UTC (rev 1267)
+++ trunk/gdata/R/read.xls.R	2008-05-13 02:55:45 UTC (rev 1268)
@@ -89,13 +89,13 @@
    con <- xls2csv(xls, sheet, verbose=verbose, ..., perl = perl)
    open(con)
    tfn <- summary(con)$description
-      if (missing(pattern))
+   if (missing(pattern))
         {
           if(verbose)
             cat("Reading csv file ", dQuote.ascii(tfn), "...\n")
           else
             cat("Reading csv file... ")            
-          read.csv(con, ...)
+          retval <- read.csv(con, ...)
           cat("Done.\n")
         }
    else {
@@ -113,8 +113,9 @@
        cat("Reading csv file ", dQuote.ascii(tfn), "...\n")
      else
        cat("Reading csv file... ")       
-     read.csv(con, skip = idx[1]-1, ...)
+     retval <- read.csv(con, skip = idx[1]-1, ...)
      cat("Done.\n")     
    }
+   retval
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[R-gregmisc-users] SF.net SVN: r-gregmisc: [1269] trunk/gdata/R/read.xls.R

[<wa...@us...>]

Revision: 1269
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1269&view=rev
Author:   warnes
Date:     2008-05-12 20:09:32 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Use path.expand() to give proper full path to xls file to be translated by read.xls()

Modified Paths:
--------------
    trunk/gdata/R/read.xls.R

Modified: trunk/gdata/R/read.xls.R
===================================================================
--- trunk/gdata/R/read.xls.R	2008-05-13 02:55:45 UTC (rev 1268)
+++ trunk/gdata/R/read.xls.R	2008-05-13 03:09:32 UTC (rev 1269)
@@ -1,4 +1,4 @@
-## $Id$
+## s$Id$
 
 ## Creating a temporary function to quote the string
 dQuote.ascii <- function(x) paste('"',x,'"',sep='')
@@ -86,7 +86,15 @@
         if (inherits(con, "connection") && isOpen(con)) close(con)
         if (file.exists(tfn)) file.remove(tfn)
    })
+
+   ## expand file path, translating ~ to user's home directory, etc.
+   xls <- path.expand(xls)
+
+
+   ## translate from xls to csv format (returns csv file name)
    con <- xls2csv(xls, sheet, verbose=verbose, ..., perl = perl)
+
+   ## load the csv file
    open(con)
    tfn <- summary(con)$description
    if (missing(pattern))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.