Enable handling of https URLs. Resolves r-gregmisc#10.

elimillera · Dec 30, 2020 · fc40809 · fc40809
1 parent da00b9b
commit fc40809
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/R/isURL.R b/R/isURL.R
@@ -0,0 +1,4 @@
+isURL <- function(x)
+{
+  sapply(x, function(X) any(startsWith(x, c("https://", "http://", "ftp://"))) )
+}
diff --git a/R/lookup.xport.R b/R/lookup.xport.R
@@ -6,7 +6,7 @@ lookup.xport <- function(file)
   {
     fname <- file
 
-    if(length(grep('http://', file))>0 || length(grep('ftp://', file))>0 )
+    if(isURL(file))
       {
         scat("Downloading file...")
         tf <- tempfile()
@@ -64,10 +64,14 @@ summary.lookup.xport <- function(object, ...)
 #' @export
 print.summary.lookup.xport <- function(x, ...)
 {
+  filname <- attr(x,"file")
+  if(Sys.getenv("RCMDCHECK") != "FALSE")
+
+
   cat("\n")
   cat("SAS xport file\n")
   cat("--------------\n");
-  cat("Filename: `", attr(x,"file"), "'\n", sep="")
+  cat("Filename: `", filename, "'\n", sep="")
   cat("\n")
   for(dSetName in unique(x$dataset))
     {

diff --git a/R/read.xport.R b/R/read.xport.R
@@ -35,7 +35,7 @@ read.xport <- function(file,
         on.exit(options(oldOptions))
       }
 
-    if(length(grep('http://', file))>0 || length(grep('ftp://', file))>0 )
+    if(isURL(file))
       {
         scat("Downloading file...")
         tf <- tempfile()