From ad323cbb653466e46368d3dc4e06a646b80c8222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Kir=C3=A1ly?= Date: Wed, 21 Aug 2024 14:50:30 +0200 Subject: [PATCH] Upgrade de.gwdg.metadataqa:metadata-qa-api from 0.9.4 to 0.9.5 #497 --- README.md | 2 +- pom.xml | 2 +- scripts/shacl4bib/shacl4bib.R | 5 +++++ .../gwdg/metadataqa/marc/cli/utils/MarcSpecSelector.java | 5 +++++ .../gwdg/metadataqa/marc/cli/utils/PicaPathSelector.java | 5 +++++ .../de/gwdg/metadataqa/marc/cli/CompletenessTest.java | 2 +- .../de/gwdg/metadataqa/marc/cli/ValidatorCliTest.java | 2 +- validate | 9 +++++++++ 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 38b902f11..d77a14e43 100644 --- a/README.md +++ b/README.md @@ -2166,7 +2166,7 @@ Parameters: * `-C `, `--shaclConfigurationFile `: specify the SHACL like configuration file * `-O `, `--shaclOutputFile `: output file (default: `shacl4bib.csv`) * `-P `, `--shaclOutputType `: specify what the output files should contain. Possible values: - * `STATUS`: status only, where the following values appear: + * `STATUS`: status only (default), where the following values appear: * `1` the criteria met, * `0` the criteria have not met, * `NA`: the data element is not available in the record), diff --git a/pom.xml b/pom.xml index c7782a3a6..90d9a7ea5 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ de.gwdg.metadataqa metadata-qa-api - 0.9.4 + 0.9.5 junit diff --git a/scripts/shacl4bib/shacl4bib.R b/scripts/shacl4bib/shacl4bib.R index 9a5ff1101..c868137d1 100644 --- a/scripts/shacl4bib/shacl4bib.R +++ b/scripts/shacl4bib/shacl4bib.R @@ -1,3 +1,8 @@ +#' it creates a statistics from the status columns counting the number +#' of distinct values from all possible values (that are 0, 1, NA). +#' The header of the file are +# id,0,1,NA +# the rows are the individual rules identified by their IDs library(tidyverse) args = commandArgs(trailingOnly=TRUE) diff --git a/src/main/java/de/gwdg/metadataqa/marc/cli/utils/MarcSpecSelector.java b/src/main/java/de/gwdg/metadataqa/marc/cli/utils/MarcSpecSelector.java index 75df04644..32b05e8d6 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/cli/utils/MarcSpecSelector.java +++ b/src/main/java/de/gwdg/metadataqa/marc/cli/utils/MarcSpecSelector.java @@ -1,5 +1,6 @@ package de.gwdg.metadataqa.marc.cli.utils; +import de.gwdg.metadataqa.api.json.DataElement; import de.gwdg.metadataqa.api.model.XmlFieldInstance; import de.gwdg.metadataqa.marc.dao.record.BibliographicRecord; import de.gwdg.metadataqa.marc.utils.marcspec.legacy.MarcSpec; @@ -20,6 +21,10 @@ public List get(String path) { return transformTags(extract(path)); } + public List get(DataElement dataElement) { + return get(dataElement.getPath()); + } + public List extract(String path) { return record.select(getMarcSpec(path)); } diff --git a/src/main/java/de/gwdg/metadataqa/marc/cli/utils/PicaPathSelector.java b/src/main/java/de/gwdg/metadataqa/marc/cli/utils/PicaPathSelector.java index fa28f9c8b..bfd0c64ae 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/cli/utils/PicaPathSelector.java +++ b/src/main/java/de/gwdg/metadataqa/marc/cli/utils/PicaPathSelector.java @@ -1,5 +1,6 @@ package de.gwdg.metadataqa.marc.cli.utils; +import de.gwdg.metadataqa.api.json.DataElement; import de.gwdg.metadataqa.api.model.XmlFieldInstance; import de.gwdg.metadataqa.marc.dao.record.BibliographicRecord; import de.gwdg.metadataqa.marc.utils.pica.path.PicaSpec; @@ -16,6 +17,10 @@ public List get(String path) { return transformTags(extract(path)); } + public List get(DataElement dataElement) { + return get(dataElement.getPath()); + } + public List extract(String path) { return record.select(new PicaSpec(path)); } diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java index c5eb858a1..3a43d8b02 100644 --- a/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java +++ b/src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java @@ -341,7 +341,7 @@ public void completeness_pica_groupBy_file() throws Exception { assertTrue(line.contains("\"pica\":true,")); assertTrue(line.contains("\"replacementInControlFields\":null,")); assertTrue(line.contains("\"marc21\":false,")); - assertTrue(line.contains("\"mqaf.version\":\"0.9.4\",")); + assertTrue(line.contains("\"mqaf.version\":\"0.9.5\",")); assertTrue(line.contains("\"qa-catalogue.version\":\"0.8.0-SNAPSHOT\"")); assertTrue(line.contains("\"duration\":\"00:00:00\"")); assertTrue(line.contains("\"numberOfprocessedRecords\":10")); diff --git a/src/test/java/de/gwdg/metadataqa/marc/cli/ValidatorCliTest.java b/src/test/java/de/gwdg/metadataqa/marc/cli/ValidatorCliTest.java index 61ac0617b..5257f95d0 100644 --- a/src/test/java/de/gwdg/metadataqa/marc/cli/ValidatorCliTest.java +++ b/src/test/java/de/gwdg/metadataqa/marc/cli/ValidatorCliTest.java @@ -247,7 +247,7 @@ public void validate_pica_groupBy() throws Exception { assertTrue(line.contains("\"pica\":true,")); assertTrue(line.contains("\"replacementInControlFields\":null,")); assertTrue(line.contains("\"marc21\":false,")); - assertTrue(line.contains("\"mqaf.version\":\"0.9.4\",")); + assertTrue(line.contains("\"mqaf.version\":\"0.9.5\",")); assertTrue(line.contains("\"qa-catalogue.version\":\"0.8.0-SNAPSHOT\"")); assertTrue(line.contains("\"duration\":\"00:00:00\"")); assertTrue(line.contains("\"numberOfprocessedRecords\":10")); diff --git a/validate b/validate index 265995c11..797b61bbe 100755 --- a/validate +++ b/validate @@ -63,15 +63,20 @@ fi SHORT_OPTIONS="m:hnl:o:i:d:qabpxyt:rz:v:f:s:g:1:2:u:j:w:k:c:e:3:4:G:SHF:R:WTI:" LONG_OPTIONS="marcVersion:,help,nolog,limit:,offset:,id:,defaultRecordType:,fixAlephseq,fixAlma,fixKbr,alephseq,marcxml,lineSeparated,outputDir:,trimId,ignorableFields:,ignorableRecords:,marcFormat:,dataSource:,defaultEncoding:,alephseqLineType:,picaIdField:,picaSubfieldSeparator:,picaSchemaFile:,schemaType:,picaRecordType:,allowableRecords:,groupBy:,groupListFile:,solrForScoresUrl:,summaryFileName:,summary,details,detailsFileName:,format:,emptyLargeCollectors,collectAllErrors,ignorableIssueTypes:" +echo "@: ${@}" + GETOPT=$(getopt \ -o ${SHORT_OPTIONS} \ --long ${LONG_OPTIONS} \ -n ${ME} -- "$@") eval set -- "${GETOPT}" +echo "GETOPT: ${GETOPT}" + PARAMS="" HELP=0 while true ; do + echo "process $1" case "$1" in -m|--marcVersion) PARAMS="$PARAMS --marcVersion $2" ; shift 2 ;; -h|--help) PARAMS="$PARAMS --help" ; HELP=1; shift ;; @@ -122,5 +127,9 @@ fi CMD="/usr/bin/java -Xmx8g -cp $JAR de.gwdg.metadataqa.marc.cli.ValidatorCli" +echo 'CMD: ' $CMD +echo 'PARAMS: ' $PARAMS +echo 'REST: ' "$@" echo $CMD $PARAMS "$@" +exit $CMD $PARAMS "$@"