Changed mechanism of selecting appropriate web portal

Author: byrongibby

R/read_database.R

@@ -19,9 +19,12 @@ read_database <- function(id, include_series = FALSE, tidy = FALSE, ...) {
   } else {
     version <- "latest"
   }
-
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[agencyid]]
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
 
 
   # Fetch data set(s) ----

R/read_dataset.R

@@ -19,9 +19,12 @@ read_dataset <- function(id, tidy = FALSE, ...) {
   } else {
     version <- "latest"
   }
-
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[agencyid]]
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
 
 
   # Fetch data set(s) ----

R/read_registry.R

@@ -27,9 +27,12 @@ read_registry <- function(structure, tidy = FALSE, ...) {
   } else {
     version <- "latest"
   }
-
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[agencyid]]
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
   params$env <- env
 
 

R/read_release.R

@@ -29,8 +29,12 @@ read_release <- function(id, tidy = FALSE, ...) {
   if (!is.null(params$description)) {
     query_params$description <- params$description
   }
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[agencyid]]
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
 
 
   # Fetch release ----

R/write_database.R

@@ -1,21 +1,25 @@
 write_database <- function(x, method = "update", ...) {
 
 
-  # Parameters ---
+  # Parameters ----
 
   params <- list(...)
   if (!is.null(params$username) && !is.null(params$password)) {
     credentials <- paste(params$username, params$password, sep = ";")
   } else {
     credentials <- NULL
   }
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
   stopifnot(length(method) == 1)
   stopifnot(method %in% c("create", "update"))
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[x$agencyid]]
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
 
 
-  # Push data message ---
+  # Push data message ----
 
   if (is.null(params$file) && !exists("econdata_session", envir = .pkgenv)) {
     login_helper(credentials, env$repository$url)
@@ -41,7 +45,7 @@ write_database <- function(x, method = "update", ...) {
   }
 
 
-  # Push each data set individually ---
+  # Push each data set individually ----
 
   lapply(datasets, function(dataset) {
     dataset_ref <- paste(attr(dataset, "metadata")$agencyid,

R/write_dataset.R

@@ -10,10 +10,14 @@ write_dataset <- function(x, method = "stage", ...) {
   } else {
     credentials <- NULL
   }
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
   stopifnot(length(method) == 1)
   stopifnot(method %in% c("stage", "validate"))
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[x$agencyid]]
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
 
 
   # Push data message ----

R/write_registry.R

@@ -9,10 +9,14 @@ write_registry <- function(structure, x, method = "update", ...) {
   } else {
     credentials <- NULL
   }
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
   stopifnot(length(method) == 1)
   stopifnot(method %in% c("create", "update"))
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[x$agencyid]]
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
   params$env <- env
 
 

R/write_release.R

@@ -23,10 +23,14 @@ write_release <- function(id, version, providerid, description, method = "releas
                                    "%Y-%m-%dT%H:%M:%S",
                                    tz = "Africa/Johannesburg")
   }
+  if (!is.null(params$portal)) {
+    portal <- params$portal
+  } else {
+    portal <- "econdata"
+  }
   stopifnot(length(method) == 1)
   stopifnot(method %in% c("release", "reset", "rollback"))
-  env <- fromJSON(system.file("settings.json",
-                              package = "econdatar"))[[agencyid]]
+  env <- fromJSON(system.file("settings.json", package = "econdatar"))[[portal]]
 
 
   # Commit data set release ----

inst/settings.json

@@ -1,5 +1,5 @@
 {
-  "ECONDATA" : {
+  "econdata" : {
     "repository" : {
       "url" : "https://www.econdata.co.za",
       "path" : "sdmx-codera/v1"
@@ -9,7 +9,7 @@
       "path" : "sdmx-codera/v1"
     }
   },
-  "FIRSTRAND" : {
+  "firstrand" : {
     "repository" : {
       "url" : "https://firstrand.econdata.co.za",
       "path" : "sdmx-codera/v1"