Merge pull request #14 from ldecicco-USGS/master

Updated docs.

R/getDataAvailability.r

@@ -7,6 +7,7 @@
 #' @keywords data import USGS web service
 #' @return retval dataframe with all information found in the expanded site file
 #' @export
+#' @import RCurl
 #' @examples
 #' # These examples require an internet connection to run
 #' availableData <- getDataAvailability('05114000')
@@ -45,7 +46,7 @@ getDataAvailability <- function(siteNumber,type=c("uv","dv","qw")){
     
     SiteFile <- SiteFile[-1,]
     
-    SiteFile <- with(SiteFile, data.frame(parameter_cd=parm_cd, statCd=stat_cd, startDate=begin_date,endDate=end_date, count=count_nu,service=data_type_cd,stringsAsFactors = FALSE))
+    SiteFile <- with(SiteFile, data.frame(site_no=site_no, parameter_cd=parm_cd, statCd=stat_cd, startDate=begin_date,endDate=end_date, count=count_nu,service=data_type_cd,stringsAsFactors = FALSE))
     
     SiteFile <- SiteFile[!is.na(SiteFile$parameter_cd),]
     SiteFile <- SiteFile["" != SiteFile$parameter_cd,]

R/tabbedDataRetrievals.R

@@ -3,8 +3,8 @@
 #' \tabular{ll}{
 #' Package: \tab dataRetrieval\cr
 #' Type: \tab Package\cr
-#' Version: \tab 1.3.1\cr
-#' Date: \tab 2014-07-01\cr
+#' Version: \tab 1.3.3\cr
+#' Date: \tab 2014-09-16\cr
 #' License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr
 #' Copyright: \tab This software is in the public domain because it contains materials
 #' that originally came from the United States Geological Survey, an agency of
@@ -17,7 +17,6 @@
 #' Collection of functions to help retrieve USGS data from either web services or user provided data files.
 #'
 #' @name dataRetrieval-package
-#' @import RCurl XML zoo
 #' @docType package
 #' @author Robert M. Hirsch \email{rhirsch@@usgs.gov}, Laura De Cicco \email{ldecicco@@usgs.gov}
 #' @references Hirsch, R. M., Moyer, D. L. and Archfield, S. A. (2010), Weighted Regressions on Time, Discharge, and Season (WRTDS), with an Application to Chesapeake Bay River Inputs. JAWRA Journal of the American Water Resources Association, 46: 857-880. doi: 10.1111/j.1752-1688.2010.00482.x

man/dataRetrieval-package.Rd

@@ -7,8 +7,8 @@
 \tabular{ll}{
 Package: \tab dataRetrieval\cr
 Type: \tab Package\cr
-Version: \tab 1.3.1\cr
-Date: \tab 2014-07-01\cr
+Version: \tab 1.3.3\cr
+Date: \tab 2014-09-16\cr
 License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr
 Copyright: \tab This software is in the public domain because it contains materials
 that originally came from the United States Geological Survey, an agency of