fix #16

eblondel · Jan 14, 2022 · 421eb39 · 421eb39
1 parent 679717e
commit 421eb39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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 
       )