Skip to content

Commit d7773d7

Browse files
yannikbuhlyannikbuhl
committed
fix merge
1 parent 4b132df commit d7773d7

File tree

1 file changed

+118
-118
lines changed

1 file changed

+118
-118
lines changed

‎R/gen_metadata.R ‎R/gen_meta_data.R

+118-118
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ gen_metadata_statistic <- function(code = NULL,
6262
name = code,
6363
...)
6464

65-
if (db == "gen_genesis_api" | db == "gen_regio_api") {
65+
if (db == "gen_api" | db == "gen_regio_api") {
6666

6767
par_list <- append(par_list, list(area = area))
6868

@@ -88,14 +88,14 @@ gen_metadata_statistic <- function(code = NULL,
8888

8989
if (isFALSE(raw)) {
9090

91-
df_stats <-cbind("Code" = results_json$Object$Code,
92-
"Content" = results_json$Object$Content,
93-
"Cubes" = results_json$Object$Cubes,
94-
"Variables" = results_json$Object$Variables,
95-
"Information" = results_json$Object$Information,
96-
"Time_from" = results_json$Object$Frequency[[1]]$From,
97-
"Time_to" = results_json$Object$Frequency[[1]]$To,
98-
"Time_type" = results_json$Object$Frequency[[1]]$Type)
91+
df_stats <-cbind("Code" = results_json$Object$Code,
92+
"Content" = results_json$Object$Content,
93+
"Cubes" = results_json$Object$Cubes,
94+
"Variables" = results_json$Object$Variables,
95+
"Information" = results_json$Object$Information,
96+
"Time_from" = results_json$Object$Frequency[[1]]$From,
97+
"Time_to" = results_json$Object$Frequency[[1]]$To,
98+
"Time_type" = results_json$Object$Frequency[[1]]$Type)
9999
} else {
100100

101101
df_stats <- results_json$Object
@@ -187,7 +187,7 @@ gen_metadata_variable <- function(code = NULL,
187187
name = code,
188188
...)
189189

190-
if (db == "gen_genesis_api" | db == "gen_regio_api") {
190+
if (db == "gen_api" | db == "gen_regio_api") {
191191

192192
par_list <- append(par_list, list(area = area))
193193

@@ -213,12 +213,12 @@ gen_metadata_variable <- function(code = NULL,
213213

214214
if (isFALSE(raw)) {
215215

216-
df_var <-cbind("Code" = results_json$Object$Code,
217-
"Content" = results_json$Object$Content,
218-
"Values" = results_json$Object$Values,
219-
"Type" = results_json$Object$Type,
220-
"Validity_from" = results_json$Object$Validity$From,
221-
"Validity_to" = results_json$Object$Validity$To)
216+
df_var <-cbind("Code" = results_json$Object$Code,
217+
"Content" = results_json$Object$Content,
218+
"Values" = results_json$Object$Values,
219+
"Type" = results_json$Object$Type,
220+
"Validity_from" = results_json$Object$Validity$From,
221+
"Validity_to" = results_json$Object$Validity$To)
222222

223223
}
224224

@@ -320,7 +320,7 @@ gen_metadata_value <- function(code = NULL,
320320
name = code,
321321
...)
322322

323-
if (db == "gen_genesis_api" | db == "gen_regio_api") {
323+
if (db == "gen_api" | db == "gen_regio_api") {
324324

325325
par_list <- append(par_list, list(area = area))
326326

@@ -346,9 +346,9 @@ gen_metadata_value <- function(code = NULL,
346346

347347
if (isFALSE(raw)) {
348348

349-
df_value <-cbind("Code" = results_json$Object$Code,
350-
"Content" = results_json$Object$Content,
351-
"Variables" = results_json$Object$Variables)
349+
df_value <-cbind("Code" = results_json$Object$Code,
350+
"Content" = results_json$Object$Content,
351+
"Variables" = results_json$Object$Variables)
352352

353353
}
354354

@@ -474,86 +474,86 @@ gen_metadata_table <- function(code = NULL,
474474

475475
if (isFALSE(raw)) {
476476

477-
char <- cbind("Code" = results_json$Object$Code,
478-
"Content" = results_json$Object$Content,
479-
"Time_From" = results_json$Object$Time$From,
480-
"Time_To" = results_json$Object$Time$To,
481-
"Valid" = results_json$Object$Valid)
477+
char <- cbind("Code" = results_json$Object$Code,
478+
"Content" = results_json$Object$Content,
479+
"Time_From" = results_json$Object$Time$From,
480+
"Time_To" = results_json$Object$Time$To,
481+
"Valid" = results_json$Object$Valid)
482482

483-
embedded <- cbind("Code" = results_json$Object$Structure$Head$Code,
484-
"Content" = results_json$Object$Structure$Head$Content,
485-
"Type" = results_json$Object$Structure$Head$Type,
486-
"Values" = results_json$Object$Structure$Head$Values,
487-
"Selection" = results_json$Object$Structure$Head$Selected,
488-
"Updated" = results_json$Object$Structure$Head$Updated)
483+
embedded <- cbind("Code" = results_json$Object$Structure$Head$Code,
484+
"Content" = results_json$Object$Structure$Head$Content,
485+
"Type" = results_json$Object$Structure$Head$Type,
486+
"Values" = results_json$Object$Structure$Head$Values,
487+
"Selection" = results_json$Object$Structure$Head$Selected,
488+
"Updated" = results_json$Object$Structure$Head$Updated)
489489

490-
structure <- list()
490+
structure <- list()
491491

492-
structure$Head <- if (length(results_json$Object$Structure$Head$Structure) == 1) {
492+
structure$Head <- if (length(results_json$Object$Structure$Head$Structure) == 1) {
493493

494-
cbind("Code" = results_json$Object$Structure$Head$Structure[[1]]$Code,
495-
"Content" = results_json$Object$Structure$Head$Structure[[1]]$Content,
496-
"Type" = results_json$Object$Structure$Head$Structure[[1]]$Type,
497-
"Values" = results_json$Object$Structure$Head$Structure[[1]]$Values,
498-
"Selected" = results_json$Object$Structure$Head$Structure[[1]]$Selected,
499-
"Structure" = results_json$Object$Structure$Head$Structure[[1]]$Structure,
500-
"Updated" = results_json$Object$Structure$Head$Structure[[1]]$Updated)
494+
cbind("Code" = results_json$Object$Structure$Head$Structure[[1]]$Code,
495+
"Content" = results_json$Object$Structure$Head$Structure[[1]]$Content,
496+
"Type" = results_json$Object$Structure$Head$Structure[[1]]$Type,
497+
"Values" = results_json$Object$Structure$Head$Structure[[1]]$Values,
498+
"Selected" = results_json$Object$Structure$Head$Structure[[1]]$Selected,
499+
"Structure" = results_json$Object$Structure$Head$Structure[[1]]$Structure,
500+
"Updated" = results_json$Object$Structure$Head$Structure[[1]]$Updated)
501501

502-
} else {
502+
} else {
503503

504-
cbind("Code" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 1)),
505-
"Content" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 2)),
506-
"Type" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 3)),
507-
"Values" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 4)),
508-
"Selected" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 5)),
509-
"Structure" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 6)),
510-
"Updated" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 7)))
504+
cbind("Code" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 1)),
505+
"Content" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 2)),
506+
"Type" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 3)),
507+
"Values" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 4)),
508+
"Selected" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 5)),
509+
"Structure" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 6)),
510+
"Updated" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 7)))
511511

512-
}
512+
}
513513

514-
structure$Columns <- if (length(results_json$Object$Structure$Columns) == 1) {
514+
structure$Columns <- if (length(results_json$Object$Structure$Columns) == 1) {
515515

516-
cbind("Code" = results_json$Object$Structure$Columns[[1]]$Code,
517-
"Content" = results_json$Object$Structure$Columns[[1]]$Content,
518-
"Type" = results_json$Object$Structure$Columns[[1]]$Type,
519-
"Unit" = results_json$Object$Structure$Columns[[1]]$Unit,
520-
"Values" = results_json$Object$Structure$Columns[[1]]$Values,
521-
"Updated" = results_json$Object$Structure$Columns[[1]]$Updated)
516+
cbind("Code" = results_json$Object$Structure$Columns[[1]]$Code,
517+
"Content" = results_json$Object$Structure$Columns[[1]]$Content,
518+
"Type" = results_json$Object$Structure$Columns[[1]]$Type,
519+
"Unit" = results_json$Object$Structure$Columns[[1]]$Unit,
520+
"Values" = results_json$Object$Structure$Columns[[1]]$Values,
521+
"Updated" = results_json$Object$Structure$Columns[[1]]$Updated)
522522

523-
} else {
523+
} else {
524524

525-
cbind("Code" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 1)),
526-
"Content" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 2)),
527-
"Type" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 3)),
528-
"Unit" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 4)),
529-
"Values" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 5)),
530-
"Updated" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 6)))
525+
cbind("Code" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 1)),
526+
"Content" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 2)),
527+
"Type" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 3)),
528+
"Unit" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 4)),
529+
"Values" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 5)),
530+
"Updated" = unlist(lapply(results_json$Object$Structure$Columns, `[[`, 6)))
531531

532-
}
532+
}
533533

534-
structure$Rows <- if (length(results_json$Object$Structure$Rows) == 1) {
534+
structure$Rows <- if (length(results_json$Object$Structure$Rows) == 1) {
535535

536-
cbind("Code" = results_json$Object$Structure$Rows[[1]]$Code,
537-
"Content" = results_json$Object$Structure$Rows[[1]]$Content,
538-
"Type" = results_json$Object$Structure$Rows[[1]]$Type,
539-
"Unit" = results_json$Object$Structure$Rows[[1]]$Unit,
540-
"Values" = results_json$Object$Structure$Rows[[1]]$Values,
541-
"Updated" = results_json$Object$Structure$Rows[[1]]$Updated)
536+
cbind("Code" = results_json$Object$Structure$Rows[[1]]$Code,
537+
"Content" = results_json$Object$Structure$Rows[[1]]$Content,
538+
"Type" = results_json$Object$Structure$Rows[[1]]$Type,
539+
"Unit" = results_json$Object$Structure$Rows[[1]]$Unit,
540+
"Values" = results_json$Object$Structure$Rows[[1]]$Values,
541+
"Updated" = results_json$Object$Structure$Rows[[1]]$Updated)
542542

543-
} else {
543+
} else {
544544

545-
cbind("Code" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 1)),
546-
"Content" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 2)),
547-
"Type" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 3)),
548-
"Unit" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 4)),
549-
"Values" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 5)),
550-
"Updated" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 6)))
545+
cbind("Code" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 1)),
546+
"Content" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 2)),
547+
"Type" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 3)),
548+
"Unit" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 4)),
549+
"Values" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 5)),
550+
"Updated" = unlist(lapply(results_json$Object$Structure$Rows, `[[`, 6)))
551551

552-
}
552+
}
553553

554-
}
554+
}
555555

556-
} # End of empty_object == "DONE"
556+
} # End of empty_object == "DONE"
557557

558558
if (isFALSE(raw)) {
559559

@@ -680,54 +680,54 @@ gen_metadata_cube <- function(code = NULL,
680680

681681
if (isFALSE(raw)) {
682682

683-
char <-cbind("Code" = results_json$Object$Code,
684-
"Content" = results_json$Object$Content,
685-
"State" = results_json$Object$State,
686-
"Values" = results_json$Object$Values)
683+
char <-cbind("Code" = results_json$Object$Code,
684+
"Content" = results_json$Object$Content,
685+
"State" = results_json$Object$State,
686+
"Values" = results_json$Object$Values)
687687

688-
time <-cbind(unlist(results_json$Object$Timeslices))
688+
time <-cbind(unlist(results_json$Object$Timeslices))
689689

690-
stat <-cbind("Code" = results_json$Object$Statistic$Code,
691-
"Content" = results_json$Object$Statistic$Content,
692-
"Updated" = results_json$Object$Statistic$Updated)
690+
stat <-cbind("Code" = results_json$Object$Statistic$Code,
691+
"Content" = results_json$Object$Statistic$Content,
692+
"Updated" = results_json$Object$Statistic$Updated)
693693

694-
structure <- list()
694+
structure <- list()
695695

696-
structure$Axis <- if (length(results_json$Object$Structure$Axis) == 1) {
696+
structure$Axis <- if (length(results_json$Object$Structure$Axis) == 1) {
697697

698-
cbind("Code" = results_json$Object$Structure$Axis[[1]]$Code,
699-
"Content" = results_json$Object$Structure$Axis[[1]]$Content,
700-
"Type" = results_json$Object$Structure$Axis[[1]]$Type,
701-
"Updated" = results_json$Object$Structure$Axis[[1]]$Updated)
698+
cbind("Code" = results_json$Object$Structure$Axis[[1]]$Code,
699+
"Content" = results_json$Object$Structure$Axis[[1]]$Content,
700+
"Type" = results_json$Object$Structure$Axis[[1]]$Type,
701+
"Updated" = results_json$Object$Structure$Axis[[1]]$Updated)
702702

703-
} else {
703+
} else {
704704

705-
cbind("Code" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 1)),
706-
"Content" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 2)),
707-
"Type" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 3)),
708-
"Updated" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 4)))
709-
}
705+
cbind("Code" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 1)),
706+
"Content" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 2)),
707+
"Type" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 3)),
708+
"Updated" = unlist(lapply(results_json$Object$Structure$Axis, `[[`, 4)))
709+
}
710710

711-
structure$Content <- if (length(results_json$Object$Structure$Contents) == 1) {
711+
structure$Content <- if (length(results_json$Object$Structure$Contents) == 1) {
712712

713-
cbind("Code" = results_json$Object$Structure$Contents[[1]]$Code,
714-
"Content" = results_json$Object$Structure$Contents[[1]]$Content,
715-
"Type" = results_json$Object$Structure$Contents[[1]]$Type,
716-
"Unit" = results_json$Object$Structure$Contents[[1]]$Unit,
717-
"Values" = results_json$Object$Structure$Contents[[1]]$Values,
718-
"Updated" = results_json$Object$Structure$Contents[[1]]$Updated,
719-
"Timeslices" = results_json$Object$Structure$Contents[[1]]$Timeslices)
713+
cbind("Code" = results_json$Object$Structure$Contents[[1]]$Code,
714+
"Content" = results_json$Object$Structure$Contents[[1]]$Content,
715+
"Type" = results_json$Object$Structure$Contents[[1]]$Type,
716+
"Unit" = results_json$Object$Structure$Contents[[1]]$Unit,
717+
"Values" = results_json$Object$Structure$Contents[[1]]$Values,
718+
"Updated" = results_json$Object$Structure$Contents[[1]]$Updated,
719+
"Timeslices" = results_json$Object$Structure$Contents[[1]]$Timeslices)
720720

721-
} else {
721+
} else {
722722

723-
cbind("Code" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 1)),
724-
"Content" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 2)),
725-
"Type" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 3)),
726-
"Unit" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 4)),
727-
"Values" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 5)),
728-
"Updated" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 7)),
729-
"Timeslices" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 6)))
730-
}
723+
cbind("Code" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 1)),
724+
"Content" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 2)),
725+
"Type" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 3)),
726+
"Unit" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 4)),
727+
"Values" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 5)),
728+
"Updated" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 7)),
729+
"Timeslices" = unlist(lapply(results_json$Object$Structure$Contents, `[[`, 6)))
730+
}
731731
}
732732
}
733733

0 commit comments

Comments
 (0)