fetchNASIS("components")/fetchVegdata: more informative error for empty selected set

brownag · brownag · commit 1c159216b2ec · 2024-12-02T16:24:11.000-08:00
diff --git a/R/fetchNASIS_components.R b/R/fetchNASIS_components.R
@@ -103,7 +103,8 @@
     }
     
   } else {
-    stop("No horizon data in NASIS component query result.", call. = FALSE)
+    ds <- ifelse(SS, "NASIS selected set", "NASIS local database")
+    stop("No component/horizon records in ", ds, call. = FALSE)
   }
 
   # add site data to object
diff --git a/R/get_vegplot_data_from_NASIS_db.R b/R/get_vegplot_data_from_NASIS_db.R
@@ -68,7 +68,7 @@ get_vegplot_from_NASIS_db <- function(SS = TRUE,
   # test for no data
   if (nrow(d.vegplot) == 0) {
     ds <- ifelse(SS, "NASIS selected set", "NASIS local database")
-    stop('No NASIS Site+Vegetation Plot records in ', ds, '!', call. = FALSE)
+    stop('No NASIS site/vegetation plot records in ', ds, call. = FALSE)
   }
   # uncode metadata domains
   d <- uncode(d.vegplot, dsn = dsn)

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`} else {`
`106`		`- stop("No horizon data in NASIS component query result.", call. = FALSE)`
	`106`	`+ ds <- ifelse(SS, "NASIS selected set", "NASIS local database")`
	`107`	`+ stop("No component/horizon records in ", ds, call. = FALSE)`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`# add site data to object`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ get_vegplot_from_NASIS_db <- function(SS = TRUE,`
`68`	`68`	`# test for no data`
`69`	`69`	`if (nrow(d.vegplot) == 0) {`
`70`	`70`	`ds <- ifelse(SS, "NASIS selected set", "NASIS local database")`
`71`		`- stop('No NASIS Site+Vegetation Plot records in ', ds, '!', call. = FALSE)`
	`71`	`+ stop('No NASIS site/vegetation plot records in ', ds, call. = FALSE)`
`72`	`72`	`}`
`73`	`73`	`# uncode metadata domains`
`74`	`74`	`d <- uncode(d.vegplot, dsn = dsn)`