diff --git a/catalogues/kbr.sh b/catalogues/kbr.sh index 1f7d64c1a..05170a97b 100755 --- a/catalogues/kbr.sh +++ b/catalogues/kbr.sh @@ -12,6 +12,6 @@ TYPE_PARAMS="${TYPE_PARAMS} --ignorableFields 590,591,592,593,594,595,596,659,90 # TYPE_PARAMS="${TYPE_PARAMS} --solrForScoresUrl http://localhost:8983/solr/kbr_scores" TYPE_PARAMS="${TYPE_PARAMS} --indexWithTokenizedField" TYPE_PARAMS="${TYPE_PARAMS} --indexFieldCounts" -MASK=kbr-*.gz +MASK=${MASK:-kbr-*.gz} . ./common-script diff --git a/scripts/classifications/classifications-type.R b/scripts/classifications/classifications-type.R index 06d88808b..95c417657 100644 --- a/scripts/classifications/classifications-type.R +++ b/scripts/classifications/classifications-type.R @@ -49,7 +49,7 @@ count <- df %>% arrange(desc(recordcount)) df2 <- count %>% - left_join(types) + left_join(types, by = join_by(scheme)) prefix <- 'classifications-by-type' csv <- sprintf("%s/%s.csv", output_dir, prefix) diff --git a/scripts/marc-history/marc-history-grouped.R b/scripts/marc-history/marc-history-grouped.R index 9a6d9a732..d9695f0cb 100644 --- a/scripts/marc-history/marc-history-grouped.R +++ b/scripts/marc-history/marc-history-grouped.R @@ -141,7 +141,7 @@ plot <- filtered %>% img_dir <- sprintf('%s/img', output_dir) if (!dir.exists(img_dir)) { - if (file.exists(img_dir) { + if (file.exists(img_dir)) { file.remove(img_dir) } dir.create(img_dir) diff --git a/scripts/pareto/frequency-range-per-types.R b/scripts/pareto/frequency-range-per-types.R index cb8b96755..de566dc8e 100644 --- a/scripts/pareto/frequency-range-per-types.R +++ b/scripts/pareto/frequency-range-per-types.R @@ -191,7 +191,7 @@ create_all_pictures <- function(dir, field, file_name) { print(paste('saving to directory ', img_dir)) if (!dir.exists(img_dir)) { - if (file.exists(img_dir) { + if (file.exists(img_dir)) { file.remove(img_dir) } print(paste('creating directory ', img_dir))