Skip to content

Main marcxml21 #2154

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.

Sign up for GitHub

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

Merged
cstarcher merged 8 commits into from
Jul 8, 2026
Merged

Main marcxml21 #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c00dfe8
subject values for marcxml21
smutniak May 22, 2026
1082f91
no 4
smutniak May 22, 2026
7b8fe89
subject not keyword
smutniak May 22, 2026
1774f7c
Merge branch 'main' into main_marcxml21
cstarcher Jul 3, 2026
a9618e5
Merge branch 'main' into main_marcxml21
cstarcher Jul 8, 2026
c3417a9
fix test error
cstarcher Jul 8, 2026
a3da09f
Merge pull request #2164 from TexasDigitalLibrary/pr_2154_test_fix
smutniak Jul 8, 2026
8f2c7d0
Merge branch 'main' into main_marcxml21
cstarcher Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/org/tdl/vireo/model/export/enums/MarcXML21Key.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public enum MarcXML21Key {
MAJOR,
DEPOSIT_URL,
ABSTRACT,
SUBJECT_FIELD_VALUES,
KEYWORD_FIELD_VALUES,
DEPARTMENT,
Comment thread
smutniak marked this conversation as resolved.
COMMITTEE_CHAIR_FIELD_VALUES,
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public void populateContext(Context context, Submission submission) {
case KEYWORD_FIELD_VALUES:
context.setVariable(key.name(), submissionHelperUtility.getKeywordFieldValues());
break;
case SUBJECT_FIELD_VALUES:
context.setVariable(key.name(), submissionHelperUtility.getSubjectFieldValues());
break;
case DEPARTMENT:
context.setVariable(key.name(), submissionHelperUtility.getDepartment());
break;
Expand Down
13 changes: 7 additions & 6 deletions src/main/resources/formats/marc21_xml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,18 +211,19 @@

<!-- 650, ETD discipline index terms -->
<!--
Source: major
Source: subjects
Example:
<marc:datafield tag="650" ind1="4" ind2=" ">
<marc:datafield tag="650" ind1=" " ind2=" ">
<marc:subfield code="a">Finance</marc:subfield>
</marc:datafield>

-->
<datafield th:if="${ MAJOR != null }" tag="650" ind1=" " ind2="4">
<subfield th:text="${ MAJOR }" code="a"></subfield>
</datafield>
<datafield th:each="subject: ${SUBJECT_FIELD_VALUES}" tag="650" ind1=" " ind2=" ">
<subfield th:text="${ subject.getValue() }" code="a"></subfield>
</datafield>
Comment thread
smutniak marked this conversation as resolved.


<!-- 653, ETD subject/keywords -->
<!-- 653, ETD keywords -->
<!--
Source: documentKeywords
Example:
Expand Down
11 changes: 6 additions & 5 deletions src/test/java/org/tdl/vireo/model/export/enums/MarcXML21KeyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ protected static Stream<Arguments> provideEnumParameters() {
Arguments.of(MarcXML21Key.MAJOR, "MAJOR", 6),
Arguments.of(MarcXML21Key.DEPOSIT_URL, "DEPOSIT_URL", 7),
Arguments.of(MarcXML21Key.ABSTRACT, "ABSTRACT", 8),
Arguments.of(MarcXML21Key.KEYWORD_FIELD_VALUES, "KEYWORD_FIELD_VALUES", 9),
Arguments.of(MarcXML21Key.DEPARTMENT, "DEPARTMENT", 10),
Arguments.of(MarcXML21Key.COMMITTEE_CHAIR_FIELD_VALUES, "COMMITTEE_CHAIR_FIELD_VALUES", 11),
Arguments.of(MarcXML21Key.COMMITTEE_MEMBER_FIELD_VALUES, "COMMITTEE_MEMBER_FIELD_VALUES", 12),
Arguments.of(MarcXML21Key.PRIMARY_DOCUMENT_MIMETYPE, "PRIMARY_DOCUMENT_MIMETYPE", 13)
Arguments.of(MarcXML21Key.SUBJECT_FIELD_VALUES, "SUBJECT_FIELD_VALUES", 9),
Arguments.of(MarcXML21Key.KEYWORD_FIELD_VALUES, "KEYWORD_FIELD_VALUES", 10),
Arguments.of(MarcXML21Key.DEPARTMENT, "DEPARTMENT", 11),
Arguments.of(MarcXML21Key.COMMITTEE_CHAIR_FIELD_VALUES, "COMMITTEE_CHAIR_FIELD_VALUES", 12),
Arguments.of(MarcXML21Key.COMMITTEE_MEMBER_FIELD_VALUES, "COMMITTEE_MEMBER_FIELD_VALUES", 13),
Arguments.of(MarcXML21Key.PRIMARY_DOCUMENT_MIMETYPE, "PRIMARY_DOCUMENT_MIMETYPE", 14)
);
}

Expand Down
Loading