From de2d2214a0d669c1f0dd855b784769ff2867ddd6 Mon Sep 17 00:00:00 2001 From: Jason Savell Date: Wed, 25 Mar 2026 15:17:14 -0500 Subject: [PATCH 1/2] add degree level to DSpaceMets export --- .../org/tdl/vireo/model/export/enums/DSpaceMETSKey.java | 1 + .../org/tdl/vireo/model/formatter/DSpaceMetsFormatter.java | 3 +++ src/main/resources/formats/dspace_mets.xml | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/src/main/java/org/tdl/vireo/model/export/enums/DSpaceMETSKey.java b/src/main/java/org/tdl/vireo/model/export/enums/DSpaceMETSKey.java index 5d5011b4fe..d6a1fc8dca 100644 --- a/src/main/java/org/tdl/vireo/model/export/enums/DSpaceMETSKey.java +++ b/src/main/java/org/tdl/vireo/model/export/enums/DSpaceMETSKey.java @@ -11,6 +11,7 @@ public enum DSpaceMETSKey { SUPPLEMENTAL_AND_SOURCE_DOCUMENT_FIELD_VALUES, LICENSE_DOCUMENT_FIELD_VALUES, METS_FIELD_VALUES, + DEGREE_LEVEL, GRADUATION_MONTH_YEAR, GRADUATION_YEAR_MONTH, GRANTOR, diff --git a/src/main/java/org/tdl/vireo/model/formatter/DSpaceMetsFormatter.java b/src/main/java/org/tdl/vireo/model/formatter/DSpaceMetsFormatter.java index 5d097767f2..b6328ddb3e 100644 --- a/src/main/java/org/tdl/vireo/model/formatter/DSpaceMetsFormatter.java +++ b/src/main/java/org/tdl/vireo/model/formatter/DSpaceMetsFormatter.java @@ -72,6 +72,9 @@ public boolean test(FieldValue fv) { } }).collect(Collectors.toList())); break; + case DEGREE_LEVEL: + context.setVariable(key.name(), submissionHelperUtility.getDegreeLevel()); + break; case GRADUATION_MONTH_YEAR: context.setVariable(key.name(), submissionHelperUtility.getGraduationMonthYearString()); break; diff --git a/src/main/resources/formats/dspace_mets.xml b/src/main/resources/formats/dspace_mets.xml index 6e401c97af..7964b710cf 100644 --- a/src/main/resources/formats/dspace_mets.xml +++ b/src/main/resources/formats/dspace_mets.xml @@ -69,6 +69,12 @@ th:text="${GRANTOR}"> + + + Date: Wed, 25 Mar 2026 15:32:43 -0500 Subject: [PATCH 2/2] update DSpaceMetsKeyTest with DEGREE_LEVEL addition --- .../tdl/vireo/model/export/enums/DSpaceMetsKeyTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/tdl/vireo/model/export/enums/DSpaceMetsKeyTest.java b/src/test/java/org/tdl/vireo/model/export/enums/DSpaceMetsKeyTest.java index 57a72e7af5..d38e8aae2f 100644 --- a/src/test/java/org/tdl/vireo/model/export/enums/DSpaceMetsKeyTest.java +++ b/src/test/java/org/tdl/vireo/model/export/enums/DSpaceMetsKeyTest.java @@ -18,10 +18,11 @@ protected static Stream provideEnumParameters() { Arguments.of(DSpaceMETSKey.SUPPLEMENTAL_AND_SOURCE_DOCUMENT_FIELD_VALUES, "SUPPLEMENTAL_AND_SOURCE_DOCUMENT_FIELD_VALUES", 7), Arguments.of(DSpaceMETSKey.LICENSE_DOCUMENT_FIELD_VALUES, "LICENSE_DOCUMENT_FIELD_VALUES", 8), Arguments.of(DSpaceMETSKey.METS_FIELD_VALUES, "METS_FIELD_VALUES", 9), - Arguments.of(DSpaceMETSKey.GRADUATION_MONTH_YEAR, "GRADUATION_MONTH_YEAR", 10), - Arguments.of(DSpaceMETSKey.GRADUATION_YEAR_MONTH, "GRADUATION_YEAR_MONTH", 11), - Arguments.of(DSpaceMETSKey.GRANTOR, "GRANTOR", 12), - Arguments.of(DSpaceMETSKey.EMBARGO_LIFT_DATE, "EMBARGO_LIFT_DATE", 13) + Arguments.of(DSpaceMETSKey.DEGREE_LEVEL, "DEGREE_LEVEL", 10), + Arguments.of(DSpaceMETSKey.GRADUATION_MONTH_YEAR, "GRADUATION_MONTH_YEAR", 11), + Arguments.of(DSpaceMETSKey.GRADUATION_YEAR_MONTH, "GRADUATION_YEAR_MONTH", 12), + Arguments.of(DSpaceMETSKey.GRANTOR, "GRANTOR", 13), + Arguments.of(DSpaceMETSKey.EMBARGO_LIFT_DATE, "EMBARGO_LIFT_DATE", 14) ); }