diff --git a/DESCRIPTION b/DESCRIPTION index f447b4b56bc96ee8eac1ee14bcbd9addef6b532a..2504f8eb30d51ac90cff6992317483df73342c49 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: rdbnomics Type: Package Title: Download DBnomics Data -Version: 0.6.2 +Version: 0.6.3 Authors@R: c(person("Sebastien", "Galais", role = c("cre", "ctb"), email = "s915.stem@gmail.com"), person("Thomas", "Brand", role = c("aut"), @@ -24,4 +24,4 @@ Suggests: rmarkdown, tinytest VignetteBuilder: knitr -RoxygenNote: 7.1.0 +RoxygenNote: 7.1.1 diff --git a/NEWS.md b/NEWS.md index 9ddfe58c0aac22c80285e6df8ac07cc0fa97e14a..2948e66814cb6b969ff7dae1e2dc32bed5ec3a15 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# rdbnomics 0.6.3 + +* New badge in README. +* Correction of .gitlab-ci.yml with pkg-config. +* Correction of `rdb()` examples in the doc and README. + # rdbnomics 0.6.2 * Remove **ggplot2**, **DT** and **dplyr** vignette dependencies. diff --git a/R/rdb.R b/R/rdb.R index 7df01794516e01a4d7c02a1a01d63572e62ec8a6..378b37910a830e200b2b1d14667b16143f05a094 100644 --- a/R/rdb.R +++ b/R/rdb.R @@ -78,12 +78,12 @@ #' # Fetch one value of one dimension from dataset 'Unemployment rate' (ZUTN) of AMECO provider: #' df1 <- rdb("AMECO", "ZUTN", dimensions = list(geo = "ea12")) #' # or -#' df1 <- rdb("AMECO", "ZUTN", dimensions = '{"geo": ["ea12"]}') +#' df1 <- rdb("AMECO", "ZUTN", dimensions = '{"geo":["ea12"]}') #' #' # Fetch two values of one dimension from dataset 'Unemployment rate' (ZUTN) of AMECO provider: #' df2 <- rdb("AMECO", "ZUTN", dimensions = list(geo = c("ea12", "dnk"))) #' # or -#' df2 <- rdb("AMECO", "ZUTN", dimensions = '{"geo": ["ea12", "dnk"]}') +#' df2 <- rdb("AMECO", "ZUTN", dimensions = '{"geo":["ea12","dnk"]}') #' #' # Fetch several values of several dimensions from dataset 'Doing business' (DB) of World Bank: #' dim <- list( @@ -93,8 +93,8 @@ #' df3 <- rdb("WB", "DB", dimensions = dim) #' # or #' dim <- paste0( -#' '{"country": ["DZ", "PE"],', -#' '"indicator": ["ENF.CONT.COEN.COST.ZS", "IC.REG.COST.PC.FE.ZS"]}' +#' '{"country":["DZ","PE"],', +#' '"indicator":["ENF.CONT.COEN.COST.ZS","IC.REG.COST.PC.FE.ZS"]}' #' ) #' df3 <- rdb("WB", "DB", dimensions = dim) #' diff --git a/R/utils.R b/R/utils.R index fa1052302cb12b203a5f0aa8cde76b45857da9f4..6376ad789188e419ab99877e55c58c9369535aa8 100644 --- a/R/utils.R +++ b/R/utils.R @@ -388,13 +388,13 @@ transform_date_timestamp <- function(DT) { check_argument(timezone, "character") from_timestamp <- c( - "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$", - "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]+Z$", + # "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$", + "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.?[0-9]*Z$", "^[0-9]{4}-[0-9]{2}-[0-9]{2}[[:blank:]]+[0-9]{2}:[0-9]{2}:[0-9]{2}$" ) to_timestamp <- c( - "%Y-%m-%dT%H:%M:%SZ", + # "%Y-%m-%dT%H:%M:%SZ", "%Y-%m-%dT%H:%M:%OSZ", "%Y-%m-%d %H:%M:%S" ) diff --git a/README.md b/README.md index bcf4a762678dae8e5dc145ed1e2584c3aebd3996..1fbed6e1d0d3f25021f82c90f70aa042129778a4 100644 --- a/README.md +++ b/README.md @@ -75,17 +75,17 @@ df4 <- rdb("IMF", "BOP", "A.FR.BCA_BP6_EUR") # Fetch one value of one dimension from dataset 'Unemployment rate' (ZUTN) of AMECO provider: df1 <- rdb("AMECO", "ZUTN", dimensions = list(geo = "ea12")) # or -df1 <- rdb("AMECO", "ZUTN", dimensions = '{"geo": ["ea12"]}') +df1 <- rdb("AMECO", "ZUTN", dimensions = '{"geo":["ea12"]}') # Fetch two values of one dimension from dataset 'Unemployment rate' (ZUTN) of AMECO provider: df2 <- rdb("AMECO", "ZUTN", dimensions = list(geo = c("ea12", "dnk"))) # or -df2 <- rdb("AMECO", "ZUTN", dimensions = '{"geo": ["ea12", "dnk"]}') +df2 <- rdb("AMECO", "ZUTN", dimensions = '{"geo":["ea12","dnk"]}') # Fetch several values of several dimensions from dataset 'Doing business' (DB) of World Bank: df3 <- rdb("WB", "DB", dimensions = list(country = c("DZ", "PE"), indicator = c("ENF.CONT.COEN.COST.ZS", "IC.REG.COST.PC.FE.ZS"))) # or -df3 <- rdb("WB", "DB", dimensions = '{"country": ["DZ", "PE"], "indicator": ["ENF.CONT.COEN.COST.ZS", "IC.REG.COST.PC.FE.ZS"]}') +df3 <- rdb("WB", "DB", dimensions = '{"country":["DZ","PE"],"indicator":["ENF.CONT.COEN.COST.ZS","IC.REG.COST.PC.FE.ZS"]}') ``` ### Fetch time series with a `query`: diff --git a/man/rdb.Rd b/man/rdb.Rd index 153be6c49614f49fcf21e812c658bf39d379bfff..c6c065fa26a488ae58532e2ecda4a020b5b94d95 100644 --- a/man/rdb.Rd +++ b/man/rdb.Rd @@ -113,12 +113,12 @@ df3 <- rdb(ids = c("AMECO/ZUTN/EA19.1.0.0.0.ZUTN", "IMF/BOP/A.FR.BCA_BP6_EUR")) # Fetch one value of one dimension from dataset 'Unemployment rate' (ZUTN) of AMECO provider: df1 <- rdb("AMECO", "ZUTN", dimensions = list(geo = "ea12")) # or -df1 <- rdb("AMECO", "ZUTN", dimensions = '{"geo": ["ea12"]}') +df1 <- rdb("AMECO", "ZUTN", dimensions = '{"geo":["ea12"]}') # Fetch two values of one dimension from dataset 'Unemployment rate' (ZUTN) of AMECO provider: df2 <- rdb("AMECO", "ZUTN", dimensions = list(geo = c("ea12", "dnk"))) # or -df2 <- rdb("AMECO", "ZUTN", dimensions = '{"geo": ["ea12", "dnk"]}') +df2 <- rdb("AMECO", "ZUTN", dimensions = '{"geo":["ea12","dnk"]}') # Fetch several values of several dimensions from dataset 'Doing business' (DB) of World Bank: dim <- list( @@ -128,8 +128,8 @@ dim <- list( df3 <- rdb("WB", "DB", dimensions = dim) # or dim <- paste0( - '{"country": ["DZ", "PE"],', - '"indicator": ["ENF.CONT.COEN.COST.ZS", "IC.REG.COST.PC.FE.ZS"]}' + '{"country":["DZ","PE"],', + '"indicator":["ENF.CONT.COEN.COST.ZS","IC.REG.COST.PC.FE.ZS"]}' ) df3 <- rdb("WB", "DB", dimensions = dim)