Skip to content

Commit 4b2a011

Browse files
yannikbuhlyannikbuhl
committed
move api urls to r environ
1 parent 66dffcd commit 4b2a011

File tree

9 files changed

+39
-31
lines changed

9 files changed

+39
-31
lines changed

‎R/gen_alternative_terms.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ gen_alternative_terms <- function(term = NULL,
2929
database = c("all", "genesis", "zensus", "regio"),
3030
verbose = TRUE,
3131
...) {
32+
3233
caller <- as.character(match.call()[1])
3334

3435
gen_fun <- test_database_function(database,

‎R/gen_api.R

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@
1717
#' }
1818
#'
1919
gen_genesis_api <- function(endpoint,
20-
overwrite_url,
2120
...) {
2221

23-
url <- ifelse(is.null(overwrite_url),
24-
"https://www-genesis.destatis.de/genesisWS/rest/2020",
25-
overwrite_url)
22+
url <- Sys.getenv("RESTATIS_GENESIS_URL")
2623

2724
user_agent <- "https://github.com/CorrelAid/restatis"
2825

@@ -75,9 +72,7 @@ gen_regio_api <- function(endpoint,
7572
overwrite_url,
7673
...) {
7774

78-
url <- ifelse(is.null(overwrite),
79-
"https://www.regionalstatistik.de/genesisws/rest/2020/",
80-
overwrite_url)
75+
url <- Sys.getenv("RESTATIS_REGIO_URL")
8176

8277
httr2::request(url) %>%
8378
httr2::req_user_agent("https://github.com/CorrelAid/restatis") %>%
@@ -109,12 +104,9 @@ gen_regio_api <- function(endpoint,
109104
#' }
110105
#'
111106
gen_zensus_api <- function(endpoint,
112-
overwrite_url,
113107
...) {
114108

115-
url <- ifelse(is.null(overwrite_url),
116-
"https://ergebnisse.zensus2022.de/api/rest/2020",
117-
overwrite_url)
109+
url <- Sys.getenv("RESTATIS_ZENSUS_URL")
118110

119111
user_agent <- "https://github.com/CorrelAid/restatis"
120112

‎R/gen_catalogue.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ gen_catalogue <- function(code = NULL,
3636
error.ignore = FALSE,
3737
verbose = TRUE,
3838
...) {
39+
3940
caller <- as.character(match.call()[1])
4041

4142
gen_fun <- test_database_function(database,

‎R/gen_cube.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ gen_cube_ <- function(name,
7272
classifyingvariable3 = NULL,
7373
classifyingkey3 = NULL,
7474
stand = NULL,
75-
language = Sys.getenv("GENESIS_LANG")) {
75+
language = Sys.getenv("RESTATIS_LANG")) {
76+
7677
area <- match.arg(area)
7778
database <- match.arg(database)
7879

‎R/gen_find.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ gen_find <- function(term = NULL,
3939
error.ignore = TRUE,
4040
verbose = TRUE,
4141
...) {
42+
4243
caller <- as.character(match.call()[1])
4344

4445
gen_fun <- test_database_function(database,

‎R/gen_jobs.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ gen_download_job <- function(name,
133133
database = c("genesis", "regio"),
134134
area = c("all", "public", "user"),
135135
compress = FALSE,
136-
language = Sys.getenv("GENESIS_LANG"),
136+
language = Sys.getenv("RESTATIS_LANG"),
137137
all_character = TRUE) {
138138

139139
#-----------------------------------------------------------------------------

‎R/gen_objects2var.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ gen_objects2var <- function(code = NULL,
3535
error.ignore = FALSE,
3636
verbose = TRUE,
3737
...) {
38+
3839
caller <- as.character(match.call()[1])
3940

4041
gen_fun <- test_database_function(database,

‎R/gen_table.R

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ gen_table_ <- function(name,
7373
classifyingvariable3 = NULL,
7474
classifyingkey3 = NULL,
7575
stand = NULL,
76-
language = Sys.getenv("GENESIS_LANG"),
76+
language = Sys.getenv("RESTATIS_LANG"),
7777
job = FALSE,
78-
all_character = TRUE,
79-
overwrite_url = NULL) {
78+
all_character = TRUE) {
8079

8180
#-----------------------------------------------------------------------------
8281
# Parameter processing
@@ -88,14 +87,6 @@ gen_table_ <- function(name,
8887

8988
}
9089

91-
if (!is.null(overwrite_url) &
92-
(!is.character(overwrite_url) | length(overwrite_url) != 1)) {
93-
94-
stop("The parameter 'overwrite_url' has to be of type 'character' and of length 1.",
95-
call. = FALSE)
96-
97-
}
98-
9990
database <- match.arg(database)
10091

10192
area <- match.arg(area)
@@ -141,8 +132,7 @@ gen_table_ <- function(name,
141132
stand = stand,
142133
language = language,
143134
format = "ffcsv",
144-
job = FALSE,
145-
overwrite_url = overwrite_url)
135+
job = FALSE)
146136

147137
#-----------------------------------------------------------------------------
148138

@@ -166,8 +156,7 @@ gen_table_ <- function(name,
166156
stand = stand,
167157
language = language,
168158
format = "ffcsv",
169-
job = job,
170-
overwrite_url = overwrite_url)
159+
job = job)
171160

172161
#-----------------------------------------------------------------------------
173162

@@ -191,8 +180,7 @@ gen_table_ <- function(name,
191180
stand = stand,
192181
language = language,
193182
format = "ffcsv",
194-
job = job,
195-
overwrite_url = overwrite_url)
183+
job = job)
196184

197185
#-----------------------------------------------------------------------------
198186

‎R/zzz.R

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,32 @@
11
.onLoad <- function(libname, pkgname) {
22

3+
# Set the functions whose results are to be cached
34
gen_genesis_api <<- memoise::memoise(gen_genesis_api)
45
gen_zensus_api <<- memoise::memoise(gen_zensus_api)
56
gen_regio_api <<- memoise::memoise(gen_regio_api)
67

7-
if (!nzchar(Sys.getenv("GENESIS_LANG"))) Sys.setenv(GENESIS_LANG = "en")
8+
# Set the default language of the package
9+
if (!nzchar(Sys.getenv("RESTATIS_LANG"))) Sys.setenv(GENESIS_LANG = "en")
10+
11+
# Set the default URL for the GENESIS database
12+
if (!nzchar(Sys.getenv("RESTATIS_GENESIS_URL"))) {
13+
14+
Sys.setenv(RESTATIS_GENESIS_URL = "https://www-genesis.destatis.de/genesisWS/rest/2020")
15+
16+
}
17+
18+
# Set the default URL for the www.regionalstatistik.de database
19+
if (!nzchar(Sys.getenv("RESTATIS_REGIO_URL"))) {
20+
21+
Sys.setenv(RESTATIS_REGIO_URL = "https://www.regionalstatistik.de/genesisws/rest/2020/")
22+
23+
}
24+
25+
# Set the default URL for the ZENSUS 2022 database
26+
if (!nzchar(Sys.getenv("RESTATIS_ZENSUS_URL"))) {
27+
28+
Sys.setenv(RESTATIS_ZENSUS_URL = "https://ergebnisse.zensus2022.de/api/rest/2020")
29+
30+
}
831

932
}

0 commit comments

Comments
 (0)