From 7caa7360d4bd34426a58e4095faf45f4f5dd90ff Mon Sep 17 00:00:00 2001 From: Dutchmen04 <54993415+Dutchmen04@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:16:29 +0100 Subject: [PATCH] fix: put the bus in huishoudensbus and bugfixes --- R/create_cssd.R | 8 +++++--- R/init_testDB.R | 7 +++++-- inst/extdata/tablesConfig.yaml | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/R/create_cssd.R b/R/create_cssd.R index 9f26f3d..470b2c6 100644 --- a/R/create_cssd.R +++ b/R/create_cssd.R @@ -107,10 +107,12 @@ busToTab <- function(new, startKey, endKey) { cbs_update_path <- function(path) { path_clean <- sub("[/\\\\]+$", "", path) parent_dir <- dirname(path_clean) - prefix <- sub("^(.*V)[0-9]+$", "\\1", basename(path_clean)) - siblings <- list.files(parent_dir, pattern = paste0("^", prefix, "([1-9]|10)$")) - versions <- as.integer(sub(paste0("^", prefix), "", siblings)) + no_ext <- sub("\\.sav$", "", basename(path_clean)) + prefix <- sub("^(.*V)[0-9]+$", "\\1", no_ext) + + siblings <- list.files(parent_dir, pattern = paste0("^", prefix, "([1-9]|10)\\.sav$")) + versions <- as.integer(sub("\\.sav$", "", sub(paste0("^", prefix), "", siblings))) updated_path <- file.path(parent_dir, siblings[which.max(versions)]) diff --git a/R/init_testDB.R b/R/init_testDB.R index e320746..52be9df 100644 --- a/R/init_testDB.R +++ b/R/init_testDB.R @@ -63,6 +63,8 @@ init_testDB <- function() { RINPERSOONS = rinpersoons, AANTALPERSSH = c(1, 2, 4, 1, 3), TYPHH = c("1100", "2100", "2200", "1100", "2100"), + DATUMAANVANGHH = as.Date(c("2020-01-01", "2019-05-15", "2021-03-10", "2018-11-01", "2022-07-01")), + DATUMEINDEHH = as.Date(c("2020-12-31", "2021-04-30", "9999-12-31", "2019-10-31", "9999-12-31")), stringsAsFactors = FALSE ) @@ -70,9 +72,10 @@ init_testDB <- function() { attr(gbahuishoudensbus$RINPERSOONS, "label") <- "Sleuteltype persoonsidentificator" attr(gbahuishoudensbus$AANTALPERSSH, "label") <- "Aantal personen in het huishouden" attr(gbahuishoudensbus$TYPHH, "label") <- "Type huishouden" + attr(gbahuishoudensbus$DATUMAANVANGHH, "label") <- "Aanvangsdatum huishoudenspositie" + attr(gbahuishoudensbus$DATUMEINDEHH, "label") <- "Einddatum huishoudenspositie" - write_sav(gbahuishoudensbus, "GBAHUISHOUDENSBUS.sav") - + haven::write_sav(gbahuishoudensbus, "GBAHUISHOUDENSBUS.sav") # ------------------------------------------------------------------------------ # 4. BAANKENMERKENBUS # ------------------------------------------------------------------------------ diff --git a/inst/extdata/tablesConfig.yaml b/inst/extdata/tablesConfig.yaml index b850330..c0a0ca5 100644 --- a/inst/extdata/tablesConfig.yaml +++ b/inst/extdata/tablesConfig.yaml @@ -20,6 +20,8 @@ tables: - OPLNIVSOI2016AGG4HBMETNIRWO - name: "GBAHUISHOUDENSBUS" + startKey: "DATUMAANVANGHH" + endKey: "DATUMEINDEHH" path_sav: 2022: "/Users/max/Documents/SoDa/GitHub/cssd/GBAHUISHOUDENSBUS.sav" cols: @@ -27,6 +29,8 @@ tables: - TYPHH - RINPERSOON - RINPERSOONS + - DATUMAANVANGHH + - DATUMEINDEHH - name: "BAANKENMERKENBUS" startKey: "DATUMAANVANGBAANID"