fix in package version check

master
Erik de Vries 2 months ago
parent e3c8d04984
commit bbec8f5547

@ -21,4 +21,4 @@ Depends: R (>= 3.3.1),
License: Copyright Erik de Vries License: Copyright Erik de Vries
Encoding: UTF-8 Encoding: UTF-8
LazyData: true LazyData: true
RoxygenNote: 7.1.0 RoxygenNote: 7.3.1

@ -26,7 +26,7 @@ elasticizer <- function(query, src = T, index = 'maml', es_user, es_pwd = .rs.as
sleep <- 30 ### Number of seconds between retries sleep <- 30 ### Number of seconds between retries
httr::set_config(httr::config(http_version = 0)) httr::set_config(httr::config(http_version = 0))
## Transitional code for syntax change in elastic package ## Transitional code for syntax change in elastic package
if (packageVersion("elastic") < 1) { if (packageVersion("elastic") < '1') {
if (localhost == F) { if (localhost == F) {
connect(es_port = 443, connect(es_port = 443,
es_transport = 'https', es_transport = 'https',

@ -8,6 +8,7 @@ elasticizer(
query, query,
src = T, src = T,
index = "maml", index = "maml",
es_user,
es_pwd = .rs.askForPassword("Elasticsearch READ"), es_pwd = .rs.askForPassword("Elasticsearch READ"),
batch_size = 1024, batch_size = 1024,
max_batch = Inf, max_batch = Inf,
@ -25,6 +26,8 @@ elasticizer(
\item{index}{The name of the Elasticsearch index to search through} \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{es_pwd}{The password for Elasticsearch read access}
\item{batch_size}{Batch size} \item{batch_size}{Batch size}

@ -9,7 +9,8 @@ sent_merger(
actors_meta = NULL, actors_meta = NULL,
actor_groups = NULL, actor_groups = NULL,
pos_cutoff = NULL, pos_cutoff = NULL,
neg_cutoff = NULL neg_cutoff = NULL,
single_party = F
) )
} }
\arguments{ \arguments{
@ -22,6 +23,8 @@ sent_merger(
\item{pos_cutoff}{Optional value above which sentence-level sentiment scores should be considered "positive"} \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{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{ \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 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

Loading…
Cancel
Save