fix for r-lib/httr#330

iobis · Apr 15, 2016 · a23b501 · a23b501
1 parent efd42b1
commit a23b501
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 34 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,7 +8,8 @@ Depends:
     R (>= 3.1.3)
 Imports:
     httr,
-    dplyr
+    dplyr,
+    jsonlite
 License: MIT
 Suggests:
     testthat

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,6 +1,7 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(occurrence)
 export(taxa)
 import(dplyr)
 import(httr)
+import(jsonlite)
diff --git a/R/occurrence.R b/R/occurrence.R
@@ -69,7 +69,8 @@ occurrence <- function(
       log_request(result)
     }
     stop_for_status(result)
-    res <- content(result, simplifyVector=TRUE)
+    text <- content(result, "text", encoding="UTF-8")
+    res <- fromJSON(text, simplifyVector=TRUE)
 
     if(!is.null(res$message)) {
       lastpage = TRUE

diff --git a/R/robis.R b/R/robis.R
@@ -4,5 +4,5 @@
 #'
 #' @docType package
 #' @name robis
-#' @import dplyr httr
+#' @import dplyr httr jsonlite
 NULL
diff --git a/R/taxa.R b/R/taxa.R
@@ -59,7 +59,8 @@ taxa <- function(
       log_request(result)
     }
     stop_for_status(result)
-    res <- content(result, simplifyVector=TRUE)
+    text <- content(result, "text", encoding="UTF-8")
+    res <- fromJSON(text, simplifyVector=TRUE)
 
     if(!is.null(res$message)) {
       lastpage = TRUE

diff --git a/man/occurrence.Rd b/man/occurrence.Rd
diff --git a/man/qc.Rd b/man/qc.Rd
diff --git a/man/robis.Rd b/man/robis.Rd
diff --git a/man/taxa.Rd b/man/taxa.Rd