fix #60

eblondel · Mar 29, 2023 · a0fb240 · a0fb240
1 parent 971ce62
commit a0fb240
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: geosapi
 Type: Package
 Title: GeoServer REST API R Interface
-Version: 0.6-5
-Date: 2023-01-06
+Version: 0.6-6
+Date: 2023-03-29
 Authors@R: c(person("Emmanuel", "Blondel", role = c("aut", "cre"), email = "emmanuel.blondel1@gmail.com", comment = c(ORCID = "0000-0002-5870-5762")))
 Maintainer: Emmanuel Blondel <emmanuel.blondel1@gmail.com>
 Description: Provides an R interface to the GeoServer REST API, allowing to upload 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+## [geosapi 0.6-6](https://cran.r-project.org/package=geosapi) | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/package=geosapi)
+
+**Enhancements**
+
+* [#60](https://github.com/eblondel/geosapi/issues/60) Fix base URL used to retrieve Geoserver version
+
+
 ## [geosapi 0.6-5](https://cran.r-project.org/package=geosapi) | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/package=geosapi)
 
 **Enhancements**

diff --git a/R/GSManager.R b/R/GSManager.R
@@ -187,7 +187,7 @@ GSManager <- R6Class("GSManager",
       }
 
       #inherit GeoServer version
-      self$version <- GSVersion$new(url, user, pwd)
+      self$version <- GSVersion$new(baseUrl, user, pwd)
 
       invisible(self)
 

diff --git a/R/GSVersion.R b/R/GSVersion.R
@@ -55,7 +55,7 @@ GSVersion <- R6Class("GSVersion",
     initialize = function(url, user, pwd){ 
 
       #try to grab version from web admin
-      req <- GET(paste(url, "web", sep = "/"))
+      req <- GET(paste(dirname(url), "web", sep = "/"))
       if(status_code(req) == 200){
         html <- htmlParse(content(req, "text", encoding = "ISO-8859-1"))
         trgSet <- getNodeSet(html, "//strong")
@@ -71,7 +71,7 @@ GSVersion <- R6Class("GSVersion",
 
       #try to grab version from REST API
       if(is.null(self$version) & is.null(self$value)){
-        req <- GSUtils$GET(url, user, pwd, "/rest/about/version.xml", FALSE)
+        req <- GSUtils$GET(url, user, pwd, "about/version.xml", verbose = FALSE)
         if(status_code(req) == 200){
           xml <- xmlParse(content(req, "text", encoding = "UTF-8"))
           trgSet <- getNodeSet(xml, "//resource[@name='GeoServer']/Version")

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Build Status](https://github.com/eblondel/geosapi/actions/workflows/r-cmd-check.yml/badge.svg?branch=master)](https://github.com/eblondel/geosapi/actions/workflows/r-cmd-check.yml)
 [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/geosapi)](https://cran.r-project.org/package=geosapi)
 [![cran checks](https://badges.cranchecks.info/worst/geosapi.svg)](https://cran.r-project.org/web/checks/check_results_geosapi.html)
-[![Github_Status_Badge](https://img.shields.io/badge/Github-0.6--5-blue.svg)](https://github.com/eblondel/geosapi)
+[![Github_Status_Badge](https://img.shields.io/badge/Github-0.6--6-blue.svg)](https://github.com/eblondel/geosapi)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1184895.svg)](https://doi.org/10.5281/zenodo.1184895)
 
 ``geosapi``: GeoServer REST API R Interface