Skip to content

Commit

Permalink
Merge pull request #208 from ldecicco-USGS/master
Browse files Browse the repository at this point in the history
Second lubridate fix
  • Loading branch information
ldecicco-USGS committed Apr 18, 2016
2 parents 588d2c9 + 7ff8d01 commit 92909d1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: dataRetrieval
Type: Package
Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
Version: 2.5.4
Date: 2016-04-7
Version: 2.5.5
Date: 2016-04-18
Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
email = "rhirsch@usgs.gov"),
person("Laura", "DeCicco", role = c("aut","cre"),
Expand Down
2 changes: 1 addition & 1 deletion R/importRDB1.r
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){

if(all(c("DATE","TIME","TZCD") %in% header.names)){
varname <- "DATETIME"
varval <- fast_strptime(paste(readr.data[,"DATE"],readr.data[,"TIME"]), "%Y-%m-%d %H%M%S", tz = "UTC")
varval <- fast_strptime(paste(readr.data[,"DATE"],readr.data[,"TIME"]), "%Y-%m-%d %H%M%S", tz = "UTC", lt=FALSE)
readr.data[,varname] <- varval
readr.data <- convertTZ(readr.data,"TZCD",varname,tz, flip.cols=TRUE)
}
Expand Down

0 comments on commit 92909d1

Please sign in to comment.