From fd39b2be5f74e4c7f861a8e6e4aefe31a56a51ff Mon Sep 17 00:00:00 2001 From: Dutchmen04 <54993415+Dutchmen04@users.noreply.github.com> Date: Sun, 25 Oct 2026 18:41:24 +0100 Subject: [PATCH 1/2] fix: bug fixes --- R/create_cssd.R | 30 +++++++++++++++--------------- inst/extdata/tablesConfig.yaml | 8 ++++---- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/R/create_cssd.R b/R/create_cssd.R index d7ac825..7e84ce0 100644 --- a/R/create_cssd.R +++ b/R/create_cssd.R @@ -32,7 +32,7 @@ create_cssd <- function(){ startKey <- table$startKey endKey <- table$endKey cols <- table$cols - joins <- joinses$tableName + joins <- joinses[[tableName]] for(year in names(tablePaths)){ @@ -46,24 +46,24 @@ create_cssd <- function(){ if(is.null(startKey)){ path = cbs_update_path(path) - new <- read_sav(path, col_select = all_of(cols)) - new <- verticalizer(new, year, startKey, endKey) - - if(is.null(data)){ - data <- new - }else if(firstRun){ - data <- rbind(data, new) - }else{ - joins <- c(joins, "year") - data <- left_join(data, new, by = joins) - } + new <- read_sav(path, col_select = all_of(cols)) + new <- verticalizer(new, year, startKey, endKey) + + if(is.null(data)){ + data <- new + }else if(firstRun){ + data <- rbind(data, new) + }else{ + joins <- c(joins, "year") + data <- left_join(data, new, by = joins) + } } - firstRun = FALSE } + firstRun = FALSE - dir.create("processed_data", showWarnings = FALSE, recursive = TRUE) - write_parquet(data, "processed_data/data.parquet") } + dir.create("processed_data", showWarnings = FALSE, recursive = TRUE) + write_parquet(data, "processed_data/data.parquet") } cbs_can_read <- function(path) { diff --git a/inst/extdata/tablesConfig.yaml b/inst/extdata/tablesConfig.yaml index c0a0ca5..63d79ea 100644 --- a/inst/extdata/tablesConfig.yaml +++ b/inst/extdata/tablesConfig.yaml @@ -1,7 +1,7 @@ tables: - name: "GBAPERSOONTAB" path_sav: - 2022: "/Users/max/Documents/SoDa/GitHub/cssd/GBAPERSOONTAB.sav" + 2022: "GBAPERSOONTABV1.sav" cols: - RINPERSOON - RINPERSOONS @@ -13,7 +13,7 @@ tables: - name: "HOOGSTEOPLJJJJTABVV" path_sav: - 2022: "/Users/max/Documents/SoDa/GitHub/cssd/HOOGSTEOPLJJJJTABVV2.sav" + 2022: "HOOGSTEOPLJJJJTABVV2.sav" cols: - RINPERSOON - RINPERSOONS @@ -23,7 +23,7 @@ tables: startKey: "DATUMAANVANGHH" endKey: "DATUMEINDEHH" path_sav: - 2022: "/Users/max/Documents/SoDa/GitHub/cssd/GBAHUISHOUDENSBUS.sav" + 2022: "GBAHUISHOUDENSBUS.sav" cols: - AANTALPERSSH - TYPHH @@ -36,7 +36,7 @@ tables: startKey: "DATUMAANVANGBAANID" endKey: "EINDEBAANID" path_sav: - 2022: "/Users/max/Documents/SoDa/GitHub/cssd/BAANKENMERKENBUS.sav" + 2022: "BAANKENMERKENBUS.sav" cols: - ARBEIDSRELATIEBAANID - SOORTBAANID From 53d6e8e5acbfa91e96a47ecb2ad4b6a717f54701 Mon Sep 17 00:00:00 2001 From: Dutchmen04 <54993415+Dutchmen04@users.noreply.github.com> Date: Sun, 25 Oct 2026 18:46:48 +0100 Subject: [PATCH 2/2] fix: logic flow errors --- R/create_cssd.R | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/R/create_cssd.R b/R/create_cssd.R index 7e84ce0..56c5441 100644 --- a/R/create_cssd.R +++ b/R/create_cssd.R @@ -45,27 +45,27 @@ create_cssd <- function(){ if(is.null(startKey)){ path = cbs_update_path(path) - - new <- read_sav(path, col_select = all_of(cols)) - new <- verticalizer(new, year, startKey, endKey) - - if(is.null(data)){ - data <- new - }else if(firstRun){ - data <- rbind(data, new) - }else{ - joins <- c(joins, "year") - data <- left_join(data, new, by = joins) - } + } + new <- read_sav(path, col_select = all_of(cols)) + new <- verticalizer(new, year, startKey, endKey) + + if(is.null(data)){ + data <- new + }else if(firstRun){ + data <- rbind(data, new) + }else{ + joins <- c(joins, "year") + data <- left_join(data, new, by = joins) } } firstRun = FALSE - } dir.create("processed_data", showWarnings = FALSE, recursive = TRUE) write_parquet(data, "processed_data/data.parquet") } + + cbs_can_read <- function(path) { con <- try(suppressWarnings(file(path, "rb")), silent = TRUE) if (inherits(con, "try-error")) return(FALSE)