From 421eb39b3b3d554f23dbfd385008fc070c18d9cc Mon Sep 17 00:00:00 2001 From: eblondel Date: Fri, 14 Jan 2022 19:23:40 +0100 Subject: [PATCH] fix #16 --- .github/workflows/r-cmd-check.yml | 12 ++++++------ R/GNOpenAPIManager.R | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/r-cmd-check.yml b/.github/workflows/r-cmd-check.yml index a0d4848..bbef96c 100644 --- a/.github/workflows/r-cmd-check.yml +++ b/.github/workflows/r-cmd-check.yml @@ -15,14 +15,14 @@ jobs: strategy: matrix: config: - #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '4.0.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.12.1', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.10.7', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '4.0.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.12.1', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.10.7', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.8.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.6.0', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.4.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.2.2', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.0.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.4.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.2.2', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '4.0.5', geonetwork: '3.0.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '2.10.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} #- {os: ubuntu-20.04, r: '4.0.5', geonetwork: '2.6.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} diff --git a/R/GNOpenAPIManager.R b/R/GNOpenAPIManager.R index c97c47f..65afb89 100644 --- a/R/GNOpenAPIManager.R +++ b/R/GNOpenAPIManager.R @@ -121,7 +121,7 @@ GNOpenAPIManager <- R6Class("GNOpenAPIManager", self$basicAuth <- TRUE #baseUrl - self$url = sprintf("%s/srv/%s", url, self$lang) + self$url = sprintf("%s/srv", url) private$keyring_service <- paste0("geonapi@", url) #try to login @@ -138,7 +138,7 @@ GNOpenAPIManager <- R6Class("GNOpenAPIManager", login = function(user, pwd){ req <- GNUtils$POST( - url = self$getUrl(), path = "/info?type=me", + url = paste0(self$getUrl(), "/", self$lang), path = "/info?type=me", user = user, pwd = pwd, content = NULL, contentType = NULL, verbose = TRUE )