fix #54 wrong xml handling

eblondel · Jun 15, 2022 · 8ad863c · 8ad863c
1 parent 4573502
commit 8ad863c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: geosapi
 Type: Package
 Title: GeoServer REST API R Interface
-Version: 0.6-2
-Date: 2022-06-13
+Version: 0.6-3
+Date: 2022-06-15
 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,10 +1,17 @@
+## [geosapi 0.6-3](https://cran.r-project.org/package=geosapi) | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-topublish-orange.svg)](https://cran.r-project.org/package=geosapi)
+
+**Bug fixes**
+
+* [#54](https://github.com/eblondel/geosapi/issues/54) Error in `getDataStore`(s) - fix wrong XML handling
+
+
 ## [geosapi 0.6-2](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)
 
 **Bug fixes**
 
 * [#53](https://github.com/eblondel/geosapi/issues/53) Shapefile upload doesn't work anymore - wrong Content-Type
 
-## [geosapi 0.6-1](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)
+## [geosapi 0.6-1](https://cran.r-project.org/package=geosapi) | [![CRAN_Status_Badge](https://img.shields.io/badge/CRAN-published-blue.svg)](https://cran.r-project.org/src/contrib/Archive/geosapi/geosapi_0.6-1.tar.gz)
 
 **Bug fixes**
 

diff --git a/R/GSDatastoreManager.R b/R/GSDatastoreManager.R
@@ -46,7 +46,7 @@ GSDataStoreManager <- R6Class("GSDataStoreManager",
               "GeoPackage" = GSGeoPackageDataStore$new(xml = xml),
               "PostGIS" = GSPostGISDataStore$new(xml = xml),
               "Oracle NG" = GSOracleNGDataStore$new(xml = xml),
-              GSAbstractDataStore$new(xml = dsXML)
+              GSAbstractDataStore$new(xml = xml)
           )
           return(dataStore)
         })
@@ -84,8 +84,8 @@ GSDataStoreManager <- R6Class("GSDataStoreManager",
           "Shapefile" = GSShapefileDataStore$new(xml = dsXML),
           "Directory of spatial files (shapefiles)" = GSShapefileDirectoryDataStore$new(xml = dsXML),
           "GeoPackage" = GSGeoPackageDataStore$new(xml = dsXML),
-          "PostGIS" = GSPostGISDataStore$new(xml = xml),
-          "Oracle NG" = GSOracleNGDataStore$new(xml = xml),
+          "PostGIS" = GSPostGISDataStore$new(xml = dsXML),
+          "Oracle NG" = GSOracleNGDataStore$new(xml = dsXML),
           GSAbstractDataStore$new(xml = dsXML)
         )
         self$INFO("Successfully fetched datastore!")

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://cranchecks.info/badges/worst/geosapi)](https://cran.r-project.org/web/checks/check_results_geosapi.html)
-[![Github_Status_Badge](https://img.shields.io/badge/Github-0.6--2-blue.svg)](https://github.com/eblondel/geosapi)
+[![Github_Status_Badge](https://img.shields.io/badge/Github-0.6--3-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