diff --git a/DESCRIPTION b/DESCRIPTION index b422a55..892b9bc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,4 +21,4 @@ Depends: R (>= 3.3.1), License: Copyright Erik de Vries Encoding: UTF-8 LazyData: true -RoxygenNote: 7.1.0 +RoxygenNote: 7.3.1 diff --git a/R/elasticizer.R b/R/elasticizer.R index 489ea7d..9396c03 100644 --- a/R/elasticizer.R +++ b/R/elasticizer.R @@ -26,7 +26,7 @@ elasticizer <- function(query, src = T, index = 'maml', es_user, es_pwd = .rs.as sleep <- 30 ### Number of seconds between retries httr::set_config(httr::config(http_version = 0)) ## Transitional code for syntax change in elastic package - if (packageVersion("elastic") < 1) { + if (packageVersion("elastic") < '1') { if (localhost == F) { connect(es_port = 443, es_transport = 'https', diff --git a/man/elasticizer.Rd b/man/elasticizer.Rd index 9e28fb5..a56c886 100644 --- a/man/elasticizer.Rd +++ b/man/elasticizer.Rd @@ -8,6 +8,7 @@ elasticizer( query, src = T, index = "maml", + es_user, es_pwd = .rs.askForPassword("Elasticsearch READ"), batch_size = 1024, max_batch = Inf, @@ -25,6 +26,8 @@ elasticizer( \item{index}{The name of the Elasticsearch index to search through} +\item{es_user}{Username used to connect, defaults to 'es'} + \item{es_pwd}{The password for Elasticsearch read access} \item{batch_size}{Batch size} diff --git a/man/sent_merger.Rd b/man/sent_merger.Rd index ba33559..b54cc4f 100644 --- a/man/sent_merger.Rd +++ b/man/sent_merger.Rd @@ -9,7 +9,8 @@ sent_merger( actors_meta = NULL, actor_groups = NULL, pos_cutoff = NULL, - neg_cutoff = NULL + neg_cutoff = NULL, + single_party = F ) } \arguments{ @@ -22,6 +23,8 @@ sent_merger( \item{pos_cutoff}{Optional value above which sentence-level sentiment scores should be considered "positive"} \item{neg_cutoff}{Optional value below which sentence-level sentiment scores should be considered "negative"} + +\item{single_party}{Boolean to generate data only from sentences in which a single party is mentioned, defaults to FALSE} } \value{ When no ids, returns actor-article dataset with individual actors, party aggregations, party-actor aggregations and overall actor sentiment (regardless of specific actors). When ids, returns aggregations for each vector in list