Attempt to fix issue #7 making the requested changes.

ropensci-archive · Jan 8, 2017 · c8b1a10 · c8b1a10
1 parent c2c5344
commit c8b1a10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/R/cfQuery.R b/R/cfQuery.R
@@ -213,6 +213,9 @@ cf_query = function(user, datatype, station, start_date, end_date = now(tz),
                  .params = all_dt_params,
                  curl = curl,
                  .opts = list(cainfo = cert))
+
+  if (is.raw(doc))
+    doc = rawToChar(doc)
 
   is_HTML = grepl("<!DOCTYPE HTML PUBLIC", doc, fixed = TRUE)
   if (is_HTML){

diff --git a/R/cfUser.R b/R/cfUser.R
@@ -215,15 +215,18 @@ cf_logout = function(object, msg = TRUE){
 
   header = getURLContent("https://cliflo.niwa.co.nz/pls/niwp/wa.logout",
                          curl = curl, header = TRUE, cainfo = cert)
-  if (!grepl("OK", header$header["statusMessage"]))
-    stop("HTTP error")
-
-  getURL("https://cliflo.niwa.co.nz/pls/niwp/wa.logout",
-         curl = curl, cainfo = cert)
-
-  file.remove(cookies)
-  if (msg)
-    message("Logout successful")
+
+  if (header$header["status"] != 200){
+    file.remove(cookies)
+    warning("HTTP status was not '200' when logging out")
+  } else {
+    getURL("https://cliflo.niwa.co.nz/pls/niwp/wa.logout",
+           curl = curl, cainfo = cert)
+
+    file.remove(cookies)
+    if (msg)
+      message("Logout successful")
+  }
 }
 
 #' @rdname valid_cfuser