#141 fixed bug in docs_bulk and similar one in msearch

removed unused function from index.R file bumped dev version
ropensci · Aug 2, 2016 · ce1622a · ce1622a
1 parent 0c25b69
commit ce1622a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,7 +8,7 @@ Description: Connect to 'Elasticsearch', a 'NoSQL' database built on the 'Java'
     requests. In addition, 'elastic' provides functions for interacting with 'APIs'
     for 'indices', documents, nodes, clusters, an interface to the cat 'API', and
     more.
-Version: 0.7.0.9000
+Version: 0.7.1.9100
 License: MIT + file LICENSE
 Authors@R: person("Scott", "Chamberlain", role = c("aut", "cre"),
     email = "myrmecocystus@gmail.com")

diff --git a/R/docs_bulk.r b/R/docs_bulk.r
@@ -138,6 +138,13 @@ docs_bulk <- function(x, index = NULL, type = NULL, chunk_size = 1000,
   UseMethod("docs_bulk")
 }
 
+#' @export
+docs_bulk.default <- function(x, index = NULL, type = NULL, chunk_size = 1000,
+                      doc_ids = NULL, es_ids = TRUE, raw = FALSE, ...) {
+
+  stop("no 'docs_bulk' method for class ", class(x), call. = FALSE)
+}
+
 #' @export
 docs_bulk.data.frame <- function(x, index = NULL, type = NULL, chunk_size = 1000,
                                  doc_ids = NULL, es_ids = TRUE, raw = FALSE, ...) {
@@ -210,8 +217,7 @@ docs_bulk.character <- function(x, index = NULL, type = NULL, chunk_size = 1000,
   on.exit(close_conns())
   checkconn()
   stopifnot(file.exists(x))
-  conn <- es_get_auth()
-  url <- paste0(conn$base, ":", conn$port, '/_bulk')
+  url <- paste0(make_url(es_get_auth()), '/_bulk')
   tt <- POST(url, make_up(), es_env$headers, ..., body = upload_file(x, type = "application/json"), encode = "json")
   geterror(tt)
   res <- cont_utf8(tt)

diff --git a/R/index.R b/R/index.R
@@ -439,8 +439,6 @@ es_POST_ <- function(index, which, args=NULL, ...){
   jsonlite::fromJSON(cont_utf8(tt), FALSE)
 }
 
-e_url <- function(x) paste0(x$base, ":", x$port)
-
 analyze_GET <- function(url, args = NULL, ...){
   checkconn()
   out <- GET(url, query=args, make_up(), es_env$headers, ...)

diff --git a/R/msearch.R b/R/msearch.R
@@ -26,8 +26,7 @@
 msearch <- function(x, raw = FALSE, asdf = FALSE, ...) {
   checkconn()
   if (!file.exists(x)) stop("file ", x, " does not exist", call. = FALSE)
-  conn <- es_get_auth()
-  url <- paste0(conn$base, ":", conn$port, '/_msearch')
+  url <- paste0(make_url(es_get_auth()), '/_msearch')
   tt <- POST(url, make_up(), es_env$headers, ..., body = upload_file(x, type = "application/json"), encode = "json")
   geterror(tt)
   res <- cont_utf8(tt)