Merge pull request #238 from jread-usgs/master

UTF-8 updates and some shorter processing jobs
DOI-USGS · Feb 3, 2016 · b3aab50 · b3aab50
2 parents 59cae02 + f9344f6
commit b3aab50
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -34,6 +34,7 @@ Imports:
     XML,
     methods,
     httr,
+    curl,
     sp,
     utils
 Suggests:

diff --git a/NAMESPACE b/NAMESPACE
@@ -79,6 +79,7 @@ importFrom(XML,xmlRoot)
 importFrom(XML,xmlTreeParse)
 importFrom(XML,xmlValue)
 importFrom(XML,xpathApply)
+importFrom(curl,curl_version)
 importFrom(httr,GET)
 importFrom(httr,POST)
 importFrom(httr,add_headers)

diff --git a/R/algorithmVersion-webprocess.R b/R/algorithmVersion-webprocess.R
@@ -2,8 +2,8 @@
 algorithmVersion <- function(knife){
   getCaps <- gGET(url(knife), query = list(
     'service' = 'WPS', 'version' = version(knife),'request' = 'DescribeProcess', 'identifier'=algorithm(knife)[[1]]))
-  doc	<-	htmlParse(getCaps,isURL=FALSE, useInternalNodes = TRUE)
+  doc <- gcontent(getCaps)
 
-  version <- xmlAttrs(getNodeSet(doc,'//processdescription')[[1]])[['wps:processversion']]
+  version <- xmlAttrs(getNodeSet(doc,'//ProcessDescription')[[1]])[['processVersion']]
   return(version)
 }
diff --git a/R/geoknifeUtils.R b/R/geoknifeUtils.R
@@ -1,3 +1,5 @@
+#' @importFrom curl curl_version
+#' @importFrom utils packageVersion
 geoknifeUserAgent <- function() {
   versions <- c(
     libcurl = curl::curl_version()$version,

diff --git a/R/start-geojob.R b/R/start-geojob.R
@@ -35,10 +35,8 @@ setMethod(f = "start",signature(.Object = "geojob"),definition = function(.Objec
   }
 	requestXML <- xml(.Object)
 	data <- genericExecute(url = url(.Object), requestXML)
-
-	xmltext <- xmlTreeParse(data, asText = TRUE,useInternalNodes=TRUE)
+	xmltext <- gcontent(data)
 	response <- xmlRoot(xmltext)
-	responseNS <- xmlNamespaceDefinitions(response, simplify = TRUE)  
 	processID <- xmlGetAttr(response,"statusLocation")
 
 	id(.Object)	<-	processID

diff --git a/README.Rmd b/README.Rmd
@@ -77,7 +77,7 @@ fabric <- webdata(list(
             url = 'http://cida.usgs.gov/thredds/dodsC/prism',
             variables = 'ppt'))
 # modify the times field:
-times(fabric) <- as.POSIXct(c('1990-01-01','2005-01-01'))
+times(fabric) <- as.POSIXct(c('2003-01-01','2005-01-01'))
 ```
 #####create the processing job that will carry out the subsetting/summarization task
 ```{r}

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-`geoknife` package version 1.1.3
+`geoknife` package version 1.1.4
 ================================
 
 [![Build status](https://ci.appveyor.com/api/projects/status/0iacmg82mp50426o/branch/master)](https://ci.appveyor.com/project/jread-usgs/geoknife/branch/master) [![Build Status](https://travis-ci.org/USGS-R/geoknife.svg)](https://travis-ci.org/USGS-R/geoknife) [![Coverage Status](https://coveralls.io/repos/USGS-R/geoknife/badge.svg)](https://coveralls.io/r/USGS-R/geoknife) [![Download Count](http://cranlogs.r-pkg.org/badges/geoknife)](https://cran.r-project.org/package=geoknife)
@@ -71,7 +71,7 @@ fabric <- webdata(list(
             url = 'http://cida.usgs.gov/thredds/dodsC/prism',
             variables = 'ppt'))
 # modify the times field:
-times(fabric) <- as.POSIXct(c('1990-01-01','2005-01-01'))
+times(fabric) <- as.POSIXct(c('2003-01-01','2005-01-01'))
 ```
 
 ##### create the processing job that will carry out the subsetting/summarization task
@@ -87,7 +87,7 @@ check(job)
     ## [1] "Process successful"
     ## 
     ## $URL
-    ## [1] "http://cida.usgs.gov:80/gdp/process/RetrieveResultServlet?id=6eb2b033-ca7b-4366-8bf7-21d66774d585OUTPUT"
+    ## [1] "http://cida.usgs.gov:80/gdp/process/RetrieveResultServlet?id=0ac86798-7a2f-47c8-b153-3673e77e3e80OUTPUT"
     ## 
     ## $statusType
     ## [1] "ProcessSucceeded"
@@ -107,8 +107,9 @@ data <- result(job)
 plot(data[,1:2], ylab = variables(fabric))
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-7-1.png)
- \#\#\#\#\#use an email to listen for process completion
+![](README_files/figure-markdown_github/unnamed-chunk-7-1.png)<!-- -->
+
+##### use an email to listen for process completion
 
 ``` r
 job <- geoknife(webgeom('state::New Hampshire'), fabric = 'prism', email = 'fake.email@gmail.com')

diff --git a/README_files/figure-markdown_github/unnamed-chunk-7-1.png b/README_files/figure-markdown_github/unnamed-chunk-7-1.png
diff --git a/vignettes/geoknife.Rmd b/vignettes/geoknife.Rmd
@@ -114,7 +114,7 @@ fabric
 ```
 which can be a starting point for the PRISM dataset, as the fields can be modified:
 ```{r}
-times(fabric) <- c('1990-01-01','2010-01-01')
+times(fabric) <- c('2002-01-01','2010-01-01')
 variables(fabric) <- c('ppt','tmx', 'tmn')
 fabric
 ```