Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: refactor to use dplyr #36

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: refactor to use dplyr #36

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions R/idig_search.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,25 @@ idig_search <- function(type="records", mq=FALSE, rq=FALSE, fields=FALSE,
" results. This functionality is currently disabled.",
" Please see https://github.com/iDigBio/ridigbio/issues/33"))
}

dat <- plyr::rbind.fill(dat, fmt_search_txt_to_df(search_results, fields))

query$offset <- nrow(dat)
dat[[i]] <- fmt_search_txt_to_df(search_results, fields)
n_res <- n_res + nrow(dat[[i]])

query$offset <- n_res
if (limit > 0){
query$limit <- limit - nrow(dat)
query$limit <- limit - n_res
}
i <- i + 1
}

dat_template <- data.frame(rep(list(logical(0)), length(fields)),
stringsAsFactors = FALSE)
names(dat_template) <- fields
dat <- dplyr::bind_rows(dat_template, dat)

# Metadata as attributes on the df
a <- attributes(dat)
a[["itemCount"]] <- item_count
a[["attribution"]] <- fmt_search_txt_to_attribution(search_results)
attributes(dat) <- a
attr(dat, "itemCount") <- item_count
attr(dat, "attribution") <- fmt_search_txt_to_attribution(search_results)

dat
}
Expand Down