fixes #257

DOI-USGS · Apr 20, 2020 · b6b53d4 · b6b53d4
1 parent 29bb6ee
commit b6b53d4
Show file tree

Hide file tree

Showing 25 changed files with 131 additions and 59 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: sbtools
 Title: USGS ScienceBase Tools
 Maintainer: David Blodgett <dblodgett@usgs.gov>
-Version: 1.1.10
+Version: 1.1.11
 Authors@R: c(person("David", "Blodgett", role=c("cre"),
     email = "dblodgett@usgs.gov"),
     person("Tim", "Kern", role=c("aut"),
@@ -32,5 +32,5 @@ Suggests:
 License: CC0
 URL: https://github.com/USGS-R/sbtools
 BugReports: https://github.com/USGS-R/sbtools/issues
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.0
 Encoding: UTF-8
diff --git a/R/REST_helpers.R b/R/REST_helpers.R
@@ -36,7 +36,12 @@ sbtools_POST <- function(url, body, ..., session){
 #' @keywords internal
 sbtools_GET <- function(url, ..., session) {
 	supported_types <- c('text/plain','text/csv','text/tab-separated-values','application/json','application/x-gzip', 'application/pdf')
-	r = GET(url = url, ..., httrUserAgent(), handle = session)
+	tryCatch({
+		r = GET(url = url, ..., httrUserAgent(), handle = session)
+	}, error = function(e) stop(paste("Error when calling ScienceBase,", 
+																		"internet or server down? Original", 
+																		"error was:\n", e))
+	)
 	handle_errors(r, url, "GET", supported_types)
 	session_age_reset()
 	return(r)

diff --git a/R/item_get_fields.R b/R/item_get_fields.R
@@ -8,11 +8,11 @@
 #' @import httr
 #' @export
 #' @examples 
+#' \donttest{
 #' # Get certain fields from an item
 #' item_get_fields("4f4e4b24e4b07f02db6aea14", c('title', 'citation', 'contacts'))
 #' 
-#' \dontrun{
-#' # If only 1 field selection, do or don't drop list format
+#' #' # If only 1 field selection, do or don't drop list format
 #' item_get_fields("4f4e4b24e4b07f02db6aea14", 'title')
 #' item_get_fields("4f4e4b24e4b07f02db6aea14", 'title', drop = FALSE)
 #' }

diff --git a/R/item_list_children.R b/R/item_list_children.R
@@ -13,9 +13,11 @@
 #'
 #' @examples \dontrun{
 #' item_list_children(user_id())
-#'
-#' as.sbitem('5060b03ae4b00fc20c4f3c8b') %>% item_list_children
-#' item_get('5060b03ae4b00fc20c4f3c8b') %>% item_list_children
+#' }
+#' 
+#' \donttest{
+#' item_list_children(as.sbitem('5060b03ae4b00fc20c4f3c8b'))
+#' item_list_children(item_get('5060b03ae4b00fc20c4f3c8b'))
 #' }
 #' @export
 item_list_children = function(sb_id, fields=c('id', 'title'), ..., session=current_session(), limit=20){

diff --git a/R/item_list_files.R b/R/item_list_files.R
@@ -13,9 +13,11 @@
 #' files attached to an item and all children items.
 #'
 #' @export
-#' @examples \dontrun{
+#' @examples 
+#' \donttest{
 #' item_list_files("4f4e4b24e4b07f02db6aea14")
-#' 
+#' }
+#' \dontrun{
 #' # list files recursively
 #' ## create item
 #' id <- item_create(user_id(), title="some title")

diff --git a/R/set_endpoint.R b/R/set_endpoint.R
@@ -10,15 +10,15 @@
 #'
 #'@examples
 #'
-#'\dontrun{
+#'\donttest{
 #'set_endpoint('prod')
 #'
 #'# getting item from production SB servers
-#'item_get('54b94448e4b0ed73b67550ea')
+#'item_get('5060b03ae4b00fc20c4f3c8b')
 #'
 #'set_endpoint('dev')
 #'# getting item from beta SB servers
-#'item_get('54b94448e4b0ed73b67550ea')
+#'item_get('521e4686e4b051c878dc35d0')
 #'
 #'}
 #'

diff --git a/man/folder_create.Rd b/man/folder_create.Rd
diff --git a/man/item_create.Rd b/man/item_create.Rd
diff --git a/man/item_file_download.Rd b/man/item_file_download.Rd
diff --git a/man/item_get_fields.Rd b/man/item_get_fields.Rd
diff --git a/man/item_list_children.Rd b/man/item_list_children.Rd
diff --git a/man/item_list_files.Rd b/man/item_list_files.Rd
diff --git a/man/item_rename_files.Rd b/man/item_rename_files.Rd
diff --git a/man/item_replace_files.Rd b/man/item_replace_files.Rd
diff --git a/man/item_rm.Rd b/man/item_rm.Rd
diff --git a/man/item_update_identifier.Rd b/man/item_update_identifier.Rd
diff --git a/man/item_upsert.Rd b/man/item_upsert.Rd
diff --git a/man/items_create.Rd b/man/items_create.Rd
diff --git a/man/items_upsert.Rd b/man/items_upsert.Rd
diff --git a/man/query_item_identifier.Rd b/man/query_item_identifier.Rd
diff --git a/man/query_item_in_folder.Rd b/man/query_item_in_folder.Rd
diff --git a/man/query_sb_datatype.Rd b/man/query_sb_datatype.Rd
diff --git a/man/query_sb_date.Rd b/man/query_sb_date.Rd
diff --git a/man/query_sb_spatial.Rd b/man/query_sb_spatial.Rd