Skip to content
This repository has been archived by the owner on Sep 22, 2022. It is now read-only.

Improved S3 summary #41

Merged
merged 1 commit into from
Feb 26, 2014
Merged

Improved S3 summary #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions R/ee_observations.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ stop_for_status(data_sources)
obs_data <- content(data_sources)

required_pages <- ee_paginator(page, obs_data$count)
all_the_pages <- ceiling(obs_data$count/page_size)


if(!quiet) message(sprintf("Search contains %s observations (downloading %s of %s pages)", obs_data$count, length(required_pages), max(required_pages)))
if(!quiet) message(sprintf("Search contains %s observations (downloading %s of %s pages)", obs_data$count, length(required_pages), all_the_pages))
if(progress) pb <- txtProgressBar(min = 0, max = length(required_pages), style = 3)


Expand Down
11 changes: 6 additions & 5 deletions R/ee_utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#'
#' @param ... additional arguments
print.ecoengine <- function(x, ...) {
cat(sprintf("[Total results]: %s \n", x$results))
cat(sprintf("[Total results on the server]: %s \n", x$results))
cat("[Args]: \n")
suppressWarnings(pretty_lists(x$call))
cat(sprintf("[Type]: %s \n", x$type))
cat(sprintf("[Number of results]: %s \n", nrow(x$data)))
cat(sprintf("[Number of results retrieved]: %s \n", nrow(x$data)))
}


Expand All @@ -36,6 +36,7 @@ ee_pages <- function(ee, page_size = 25) {
#'Takes a page range and total number of observations to return the right sequence of pages that need to be crawled.
#' @param page requested page number or page range. Can also be "all"
#' @param total_obs Total number of records available for any search query
#' @param page_size Default is \code{25}. Set higher if needed.
#' @export
#' @examples \dontrun{
#' ee_paginator(1, 100)
Expand All @@ -45,9 +46,9 @@ ee_pages <- function(ee, page_size = 25) {
#' # This will return an error since there are only 4 pages per 100 observations
#' ee_paginator(1:5, 100)
#' }
ee_paginator <- function(page, total_obs) {
all_pages <- ceiling(total_obs/25)
if(total_obs < 25) { req_pages <- 1 }
ee_paginator <- function(page, total_obs, page_size = 25) {
all_pages <- ceiling(total_obs/page_size)
if(total_obs < page_size) { req_pages <- 1 }
if(identical(page, "all")) { req_pages <- seq_along(1: all_pages)}
if(length(page) == 1 & identical(class(page), "numeric")) { req_pages <- page }
if(identical(class(page), "integer")) {
Expand Down