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.

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

Support multiple na values #56

Merged
merged 3 commits into from Jan 19, 2017
Merged

Conversation

jmarshallnz
Copy link

Takes care of #13, and fixes a bug where NA = "1" didn't work for .xls sheets.

@@ -53,7 +53,7 @@ parse_ref <- function(ref) {
.Call('readxl_parse_ref', PACKAGE = 'readxl', ref)
}

xlsx_col_types <- function(path, sheet = 0L, na = "", nskip = 0L, n = 100L) {
xlsx_col_types <- function(path, sheet = 0L, na = as.character( c()), nskip = 0L, n = 100L) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A more compact form is character()

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah - by the looks the Rcpp attributes compilation changed in 0.11.1. Instead of CharacterVector::create() to create a default, you should now use CharacterVector().

Fixed.

@hadley
Copy link
Member

hadley commented Apr 10, 2015

Looks great apart from that one tiny problem

@jmarshallnz
Copy link
Author

Rebased + updated.

@MichaelChirico
Copy link
Contributor

@jmarshallnz @hadley any activity here? Wondering whether to patch up #136 or not.

@hadley
Copy link
Member

hadley commented Jan 18, 2017

Looks good - just needs a bullet point in NEWS.

@jennybc can you please merge when ready? (or add the bullet point if @jmarshallnz has moved on to other things)

@jmarshallnz
Copy link
Author

jmarshallnz commented Jan 18, 2017 via email

@jennybc jennybc merged commit 271fa1b into tidyverse:master Jan 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants