-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bda - getter function #127
Conversation
add lines variable_reference.csv add lines country_thesaurus.csv
@zoometh what a great starting point. I do not know how far you are to write the actual parser, but maybe you want to consider to have a look a the parser for the euroevol database. This database is also based on multiple individual files that need to be joined. If you need any assistance, I am there as well. Many thanks for your contribution already 👍 |
@dirkseidensticker Yes I've started to write the |
@dirkseidensticker I've finally created the |
@zoometh we made some changes within #128 and the latest v2 release. We removed the url table which one had to update on the remote. Could you pull the changes and add your url's to the new db_info_table.csv table? Removing the odd |
I've just added a line in |
|
||
unzip(temp, files="BDA-Table_Dates.xlsx", exdir=td, overwrite=TRUE) | ||
c14dates <- readxl::read_excel(paste0(td,"/BDA-Table_Dates.xlsx")) | ||
unzip(temp, files="BDA-Table_Occupations.xlsx", exdir=td, overwrite=TRUE) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add utils::unzip(...
c14dates <- readxl::read_excel(paste0(td,"/BDA-Table_Dates.xlsx")) | ||
unzip(temp, files="BDA-Table_Occupations.xlsx", exdir=td, overwrite=TRUE) | ||
c14occupa <- readxl::read_excel(paste0(td,"/BDA-Table_Occupations.xlsx")) | ||
unzip(temp, files="BDA-Table_Sites.xlsx", exdir=td, overwrite=TRUE) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add utils::unzip(...
c14occupa <- readxl::read_excel(paste0(td,"/BDA-Table_Occupations.xlsx")) | ||
unzip(temp, files="BDA-Table_Sites.xlsx", exdir=td, overwrite=TRUE) | ||
c14sites <- readxl::read_excel(paste0(td,"/BDA-Table_Sites.xlsx")) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add
names(c14dates) <- gsub("\u00E9", "e", names(c14dates))
names(c14occupa) <- gsub("\u00E9", "e", names(c14occupa))
names(c14sites) <- gsub("\u00E9", "e", names(c14sites))
in order to replace non-ascii characters
dplyr::left_join(c14sites, by = c("id_site_associé" = "id_sites")) %>% | ||
dplyr::left_join(c14occupa, by = c("id_occupation_liée" = "id_occupations_2019")) %>% | ||
dplyr::transmute( | ||
method = .data[["Méthode"]], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "Méthode"
into "Methode"
site = .data[["Nom_site"]], | ||
sitetype = .data[["Nature_site"]], | ||
feature = .data[["num_couche"]], | ||
period = .data[["période"]], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "période"
into ""periode"
feature = .data[["num_couche"]], | ||
period = .data[["période"]], | ||
culture = .data[["culture"]], | ||
material = .data[["Matériel_daté"]], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "Matériel_daté"
into `"Matèriel_date"
period = .data[["période"]], | ||
culture = .data[["culture"]], | ||
material = .data[["Matériel_daté"]], | ||
species = .data[["Matériel_daté_précision"]], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "Matériel_daté_précision"
into "Materiel_date_precision"
culture = .data[["culture"]], | ||
material = .data[["Matériel_daté"]], | ||
species = .data[["Matériel_daté_précision"]], | ||
region = .data[["Région"]], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "Région"
into "Region"
lat = .data[["Latitude"]], | ||
lon = .data[["Longitude"]], | ||
shortref = .data[["Ref_biblio"]], | ||
comment = .data[["Fiabilité.x"]], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "Fiabilité.x"
into "Fiabilite.x"
c14sites <- readxl::read_excel(paste0(td,"/BDA-Table_Sites.xlsx")) | ||
|
||
bda <- c14dates %>% | ||
dplyr::left_join(c14sites, by = c("id_site_associé" = "id_sites")) %>% |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "id_site_associé"
into "id_site_associe"
|
||
bda <- c14dates %>% | ||
dplyr::left_join(c14sites, by = c("id_site_associé" = "id_sites")) %>% | ||
dplyr::left_join(c14occupa, by = c("id_occupation_liée" = "id_occupations_2019")) %>% |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change "id_occupation_liée"
into "id_occupation_liee"
data-raw/url_reference.csv
Outdated
@@ -21,3 +21,4 @@ emedyd,2017,1,https://discovery.ucl.ac.uk/id/eprint/1570274/1/robertsetal17.zip | |||
katsianis,2020-08-20,1,https://rdr.ucl.ac.uk/ndownloader/files/23166314 | |||
rapanui,2020-08-21,1,https://github.com/clipo/rapanui-radiocarbon/archive/master.zip | |||
mesorad,2020-09-01,1,https://github.com/eehh-stanford/price2020/raw/master/MesoRAD-v.1.1_FINAL_no_locations.xlsx | |||
bda,2021-03-23,1,https://api.nakala.fr/data/10.34847/nkl.dde9fnm8/189e04d917ffd68352a389006f357b58efda855e |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
line should be removed, as it is solved with #130
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dear @zoometh , please excuse the long waiting time. I checked you parser, which looks (nearly) perfect! Congratulations and many thanks for your efforts from @nevrome and myself.
While running the checks, I noticed that you kept the french "é" in the column header. While this does not trigger an error, it flags a warning. Could you replace those characters?
Also, I noticed that you PR #130 was a bit redundant. Just keep in mind that when you add the url to the reference table, you would need to perform a "Clean and Rebuild" (in RStudio within the "More" menue within the "Build" tab. That triggers that the helper indices, like db_info_table
are build again. Maybe we should add this to the README? @nevrome what do you think?
Dear ***@***.****, ***@***.*** *I'm currently out of the office with
little access to the internet. Get back to work next Sunday (!). If that's
fine for you I will accomplish the required changes at this date. Let me
know,
…On Thu, Apr 1, 2021 at 1:32 PM Dirk Seidensticker ***@***.***> wrote:
***@***.**** requested changes on this pull request.
dear @zoometh <https://github.com/zoometh> , please excuse the long
waiting time. I checked you parser, which looks (nearly) perfect!
Congratulations and many thanks for your efforts from @nevrome
<https://github.com/nevrome> and myself.
While running the checks, I noticed that you kept the french "é" in the
column header. While this does not trigger an error, it flags a warning.
Could you replace those characters?
Also, I noticed that you PR #130
<#130> was a bit redundant.
Just keep in mind that when you add the url to the reference table, you
would need to perform a "Clean and Rebuild" (in RStudio within the "More"
menue within the "Build" tab. That triggers that the helper indices, like
db_info_table are build again. Maybe we should add this to the README?
@nevrome <https://github.com/nevrome> what do you think?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#127 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AQGHHLTWWMKDALQTLVZHWADTGRKVFANCNFSM4ZU4RE3Q>
.
|
I missed this one yesterday: you need to run |
Yes - it's maybe a bit tricky that no5, 6 and 7 don't do anything without 8, but I didn't want to be redundant |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess that's all fine. What will be the next step @dirkseidensticker ?
first step to recover the 'bda' C14 database
added values/complete the files:
added 'bda' to get_c14data()