From 05f844e1b27cfd91fb82c4ceef3b1752445516b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Thu, 19 Sep 2024 12:33:56 +0200 Subject: [PATCH 1/2] Update elements --- .../marc/definition/tags/hbztags/Tag029.java | 16 ++++++++++++++-- .../marc/definition/tags/hbztags/Tag089.java | 4 ++-- .../marc/definition/tags/hbztags/Tag099.java | 10 +++++++--- .../marc/definition/tags/hbztags/Tag980.java | 4 ++-- .../marc/definition/tags/hbztags/Tag983.java | 2 +- .../marc/definition/tags/hbztags/Tag985.java | 18 ++++++++++++++++++ .../marc/definition/tags/hbztags/Tag986.java | 2 +- .../marc/definition/tags/hbztags/Tag987.java | 2 +- .../marc/definition/tags/hbztags/Tag998.java | 6 +++--- .../marc/definition/tags/tags1xx/Tag130.java | 3 ++- .../marc/definition/tags/tags20x/Tag240.java | 3 ++- 11 files changed, 53 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag029.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag029.java index a2e1a8b9..efb29b99 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag029.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag029.java @@ -29,8 +29,20 @@ private void initialize() { cardinality = Cardinality.Repeatable; descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=525369446"; - ind1 = new Indicator(); - ind2 = new Indicator(); + ind1 = new Indicator("nicht definiert") + .setCodes( " ", "ISSN formal nicht geprüft", + "1", "ISSN formal richtig", + "2", "ISSN formal falsch" + ) + .setMqTag("NichtDefiniert"); + + ind2 = new Indicator("nicht definiert") + .setCodes( "a", "Autorisierte ISSN", + "b", "ISSN der Ausgabe auf Datenträger", + "c", "ISSN der Internetausgabe", + "d", "ISSN der Druckausgabe" + ) + .setMqTag("NichtDefiniert"); setSubfieldsWithCardinality( "a", "Autorisierte ISSN", "NR", diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag089.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag089.java index f665fa23..2d3162d3 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag089.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag089.java @@ -31,7 +31,7 @@ private void initialize() { ind1 = new Indicator("Ausgabe") .setCodes( - " ", "empty", + " ", "No information provided", "0", "Vollversion", "1", "Kurzausgabe" ) @@ -39,7 +39,7 @@ private void initialize() { ind2 = new Indicator("Nicht erstellt von LC") .setCodes( - " ", "empty", + " ", "No information provided", "4", "Erstellt nicht von LC" ) .setMqTag("nichtVonLCERstellt"); diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag099.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag099.java index 79228321..949224ec 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag099.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag099.java @@ -30,12 +30,16 @@ private void initialize() { cardinality = Cardinality.Nonrepeatable; descriptionUrl = "https://service-wiki.hbz-nrw.de/pages/viewpage.action?pageId=698777686"; - ind1 = new Indicator(); + ind1 = new Indicator("nicht definiert") + .setCodes( + "1", "Erstellungsdatum des Austauschsatzes", + "2", "letzte Transaktion" + ) + .setMqTag("NichtDefiniert"); ind2 = new Indicator(); setSubfieldsWithCardinality( - "a", "Kennzeichnungen für Nationallizenzen und digitale Sammlungen", "NR", - "b", "Lizenzjahr", "NR" + "a", "Datum", "NR" ); } } diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag980.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag980.java index 9830804c..1d06a55e 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag980.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag980.java @@ -31,8 +31,8 @@ private void initialize() { ind1 = new Indicator("undefined") .setCodes( - "1", "...", - "2", "..." + "1", "Selektionskennzeichen", + "2", "LKR" ) .setMqTag("undefined"); diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag983.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag983.java index 1757dddb..a321625c 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag983.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag983.java @@ -37,7 +37,7 @@ private void initialize() { "b", "Notation", "R", "c", "Notation", "R", "d", "Beschreibung", "R", - "z", "Herkunft", "NR" + "2", "Herkunft", "NR" ); } diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag985.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag985.java index cf7e480f..1b5055a1 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag985.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag985.java @@ -57,5 +57,23 @@ private void initialize() { "8", "Feldverknüpfung und Reihenfolge", "NR" ); + + getSubfield("c").setCodes( + "0", "kein Schaden", + "1", "leichter Schaden", + "2", "mittlerer Schaden", + "3", "schwerer Schaden" + ); + + getSubfield("d").setCodes( + "Ersatzbeschaffung geplant", "Ersatzbeschaffung geplant", + "restauriert", "restauriert", + "Schutzverpackung", "Schutzverpackung", + "Maßnahme geplant", "Maßnahme geplant" + ); + + getSubfield("p").setCodes( + "unvollständiger Provenienzvermerk", "unvollständiger Provenienzvermerk" + ); } } diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag986.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag986.java index 01452a84..feeffabd 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag986.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag986.java @@ -39,7 +39,7 @@ private void initialize() { "i", "Herstellungsjahr", "R", "j", "Entstehungsort", "R", "k", "Referenznummern/Nachweis", "R", - "l", " Bemerkungen ", "R", + "l", "Bemerkungen", "R", "8", "Feldverknüpfung und Reihenfolge", "NR" ); } diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag987.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag987.java index fdf4223f..bae2d974 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag987.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag987.java @@ -31,7 +31,7 @@ private void initialize() { ind1 = new Indicator("undefined") .setCodes( - "1", "..." + "1", "Mikrocodierung" ) .setMqTag("undefined"); diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag998.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag998.java index 64e874ff..e82c1d4b 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag998.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/hbztags/Tag998.java @@ -31,10 +31,10 @@ private void initialize() { ind1 = new Indicator("undefined") .setCodes( - " ", "...", - "4", "4" + " ", "Keine Information vorhanden", + "4", "HTTP" ) - .setMqTag("undefined"); + .setMqTag("Zugangsmethode"); ind2 = new Indicator(); diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags1xx/Tag130.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags1xx/Tag130.java index 60112f89..407624a4 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags1xx/Tag130.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags1xx/Tag130.java @@ -191,7 +191,8 @@ private void initialize() { )); putVersionSpecificSubfields(MarcVersion.HBZ, Arrays.asList( - new SubfieldDefinition("B", "Authority ID subfield", "NR") + new SubfieldDefinition("B", "Authority ID subfield", "NR"), + new SubfieldDefinition("9", "Feldzuordnung Aleph", "R") )); sourceSpecificationType = SourceSpecificationType.Subfield2; diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags20x/Tag240.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags20x/Tag240.java index a7f3c2c6..e81f3902 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags20x/Tag240.java +++ b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/tags20x/Tag240.java @@ -194,7 +194,8 @@ private void initialize() { )); putVersionSpecificSubfields(MarcVersion.HBZ, Arrays.asList( - new SubfieldDefinition("B", "Authority ID subfield", "NR") + new SubfieldDefinition("B", "Authority ID subfield", "NR"), + new SubfieldDefinition("9", "Feldzuordnung Aleph", "R") )); } } From c778daf48198b1e60d4ce03290c072d1c5c0c4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Thu, 19 Sep 2024 13:08:51 +0200 Subject: [PATCH 2/2] Fix catalogue scripts --- catalogues/hbz-update.sh | 2 +- catalogues/hbz.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogues/hbz-update.sh b/catalogues/hbz-update.sh index 52d9968f..887af3b9 100755 --- a/catalogues/hbz-update.sh +++ b/catalogues/hbz-update.sh @@ -11,7 +11,7 @@ if [[ $TYPE == "marc" ]]; then MASK=*.mrc elif [[ $TYPE == "xml" ]]; then echo "xml" - TYPE_PARAMS="--marcVersion HBZ --marcxml --fixAlma --ignorableRecords DEL$a=Y --ignorableFields 964 940 941 942 944 945 946 947 948 949 950 951 952 955 956 957 958 959 966 967 970 971 972 973 974 975 976 977 978 978 979" + TYPE_PARAMS="--marcVersion HBZ --marcxml --fixAlma --ignorableRecords DEL$a=Y --ignorableFields 964,940,941,942,944,945,946,947,948,949,950,951,952,955,956,957,958,959,966,967,970,971,972,973,974,975,976,977,978,978,979" MARC_DIR=${BASE_INPUT_DIR}/${NAME}/marc MASK=*.gz else diff --git a/catalogues/hbz.sh b/catalogues/hbz.sh index a3b644fd..4c0eab64 100755 --- a/catalogues/hbz.sh +++ b/catalogues/hbz.sh @@ -11,7 +11,7 @@ if [[ $TYPE == "marc" ]]; then MASK=*.mrc elif [[ $TYPE == "xml" ]]; then echo "xml" - TYPE_PARAMS="--marcVersion HBZ --marcxml --fixAlma --ignorableRecords DEL$a=Y --ignorableFields 964 940 941 942 944 945 946 947 948 949 950 951 952 955 956 957 958 959 966 967 970 971 972 973 974 975 976 977 978 978 979" + TYPE_PARAMS="--marcVersion HBZ --marcxml --fixAlma --ignorableRecords DEL$a=Y --ignorableFields 964,940,941,942,944,945,946,947,948,949,950,951,952,955,956,957,958,959,966,967,970,971,972,973,974,975,976,977,978,978,979" MARC_DIR=${BASE_INPUT_DIR}/${NAME}/marc MASK=*.gz else