Skip to content

Commit

Permalink
Fixed build check notes for breaks and read.csv import
Browse files Browse the repository at this point in the history
  • Loading branch information
bryn-g committed Jun 15, 2018
1 parent 9f47d68 commit 3a213c2
Show file tree
Hide file tree
Showing 31 changed files with 81 additions and 102 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.Rhistory
cred.R
.Rproj.user
2 changes: 1 addition & 1 deletion SocialMediaLab/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ Suggests:
Author: Timothy Graham & Robert Ackland with contribution from Chung-hong Chan
Maintainer: Timothy Graham <Timothy.Graham@anu.edu.au>
License: GPL (>= 2)
RoxygenNote: 5.0.1
RoxygenNote: 6.0.1
2 changes: 1 addition & 1 deletion SocialMediaLab/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ importFrom(twitteR,setup_twitter_oauth)
importFrom(twitteR,twListToDF)
importFrom(utils,"flush.console")
importFrom(utils,"install.packages")
importFrom(utils,"read.csv")
importFrom(utils,"read.table")
importFrom(utils,"write.csv")
importFrom(utils,head)
importFrom(utils,"read.csv")
2 changes: 1 addition & 1 deletion SocialMediaLab/R/CollectDataFacebook.R
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function(pageName,rangeFrom,rangeTo,verbose,n,writeToFile,credential = NULL) {

if (missing(pageName)) {
cat("Error. Argument `pageName` is missing.\nPlease specify a Facebook page to collect data from.\n")
break
return(NA)
}

# If date range has not been specified, or one of the range values is missing,
Expand Down
2 changes: 1 addition & 1 deletion SocialMediaLab/R/CollectDataTwitter.R
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function(searchTerm, numTweets, verbose, writeToFile, language, since, until,

if (missing(searchTerm)) {
cat("Error. Argument `searchTerm` is missing.\nPlease specify a search term or hashtag to collect data from.\n")
break
return(NA)
}

if (missing(since)) {
Expand Down
4 changes: 2 additions & 2 deletions SocialMediaLab/R/CollectDataYoutube.R
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ function(videoIDs, apiKeyYoutube, verbose, writeToFile, maxComments) {

if (missing(apiKeyYoutube)) {
cat("Error. Argument `apiKeyYoutube` is missing. Please specify a valid API key to collect data (i.e. your Google Developer API Key).\n")
break
return(NA)
}

# Ensure that argument `pageName` has been specified by user.

if (missing(videoIDs)) {
cat("Error. Argument `videoIDs` is missing.\nPlease specify a vector of video IDs to collect data from.\n Hint: to do this you can use the `GetYoutubeVideoIDs` function in this package.")
break
return(NA)
}

apiKey <- apiKeyYoutube # to play nice with existing code
Expand Down
2 changes: 1 addition & 1 deletion SocialMediaLab/R/SocialMediaLab-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@
#' @importFrom twitteR lookupUsers searchTwitter setup_twitter_oauth twListToDF
#' @importFrom stringr str_extract str_replace_all str_match_all
#' @importFrom stats 'na.omit'
#' @importFrom utils "flush.console" head "install.packages" "read.table" "write.csv"
#' @importFrom utils "flush.console" head "install.packages" "read.table" "write.csv" "read.csv"
NULL
7 changes: 3 additions & 4 deletions SocialMediaLab/man/Authenticate.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/AuthenticateWithFacebookAPI.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/AuthenticateWithInstagramAPI.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/AuthenticateWithTwitterAPI.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/AuthenticateWithYoutubeAPI.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions SocialMediaLab/man/Collect.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CollectDataFacebook.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CollectDataInstagram.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CollectDataTwitter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CollectDataYoutube.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion SocialMediaLab/man/CollectEgoInstagram.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions SocialMediaLab/man/Create.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CreateActorNetwork.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CreateBimodalNetwork.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CreateDynamicNetwork.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions SocialMediaLab/man/CreateEgoNetwork.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion SocialMediaLab/man/CreateEgoNetworkFromData.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3a213c2

Please sign in to comment.