From c00dfe8c37389fa51da701e4415cbb07d1cadc5e Mon Sep 17 00:00:00 2001
From: frank <fsmutniak@gmail.com>
Date: Fri, 22 May 2026 10:20:09 -0500
Subject: [PATCH 1/4] subject values for marcxml21

---
 .../tdl/vireo/model/export/enums/MarcXML21Key.java  |  1 +
 .../vireo/model/formatter/MarcXML21Formatter.java   |  3 +++
 src/main/resources/formats/marc21_xml.xml           | 13 +++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/tdl/vireo/model/export/enums/MarcXML21Key.java b/src/main/java/org/tdl/vireo/model/export/enums/MarcXML21Key.java
index 88e83ac56c..fbac8e9545 100644
--- a/src/main/java/org/tdl/vireo/model/export/enums/MarcXML21Key.java
+++ b/src/main/java/org/tdl/vireo/model/export/enums/MarcXML21Key.java
@@ -10,6 +10,7 @@ public enum MarcXML21Key {
     MAJOR,
     DEPOSIT_URL,
     ABSTRACT,
+    SUBJECT_FIELD_VALUES,
     KEYWORD_FIELD_VALUES,
     DEPARTMENT,
     COMMITTEE_CHAIR_FIELD_VALUES,
diff --git a/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java b/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
index a27ae996de..61019154bb 100644
--- a/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
+++ b/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
@@ -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.getKeywordFieldValues());
+                break;
             case DEPARTMENT:
                 context.setVariable(key.name(), submissionHelperUtility.getDepartment());
                 break;
diff --git a/src/main/resources/formats/marc21_xml.xml b/src/main/resources/formats/marc21_xml.xml
index 14aa00ef48..714a8a0fd3 100644
--- a/src/main/resources/formats/marc21_xml.xml
+++ b/src/main/resources/formats/marc21_xml.xml
@@ -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="4" ind2=" ">
+        <subfield th:text="${ subject.getValue() }" code="a"></subfield>
+    </datafield>
+
 
-    <!-- 653, ETD subject/keywords -->
+    <!-- 653, ETD keywords -->
     <!--
         Source: documentKeywords
         Example:

From 1082f91b6e51c244d99879b4a0003f5212c9a152 Mon Sep 17 00:00:00 2001
From: frank <fsmutniak@gmail.com>
Date: Fri, 22 May 2026 10:21:09 -0500
Subject: [PATCH 2/4] no 4

---
 src/main/resources/formats/marc21_xml.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/formats/marc21_xml.xml b/src/main/resources/formats/marc21_xml.xml
index 714a8a0fd3..2b55b920c0 100644
--- a/src/main/resources/formats/marc21_xml.xml
+++ b/src/main/resources/formats/marc21_xml.xml
@@ -218,7 +218,7 @@
              </marc:datafield>
              
      -->
-    <datafield th:each="subject: ${SUBJECT_FIELD_VALUES}" tag="650" ind1="4" ind2=" ">
+    <datafield th:each="subject: ${SUBJECT_FIELD_VALUES}" tag="650" ind1=" " ind2=" ">
         <subfield th:text="${ subject.getValue() }" code="a"></subfield>
     </datafield>
 

From 7b8fe89ef5d854b11665687cbbdd53bccc29177f Mon Sep 17 00:00:00 2001
From: frank <fsmutniak@gmail.com>
Date: Fri, 22 May 2026 11:41:57 -0500
Subject: [PATCH 3/4] subject not keyword

---
 .../java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java b/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
index 61019154bb..e610b42ce5 100644
--- a/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
+++ b/src/main/java/org/tdl/vireo/model/formatter/MarcXML21Formatter.java
@@ -67,7 +67,7 @@ public void populateContext(Context context, Submission submission) {
                 context.setVariable(key.name(), submissionHelperUtility.getKeywordFieldValues());
                 break;
             case SUBJECT_FIELD_VALUES:
-                context.setVariable(key.name(), submissionHelperUtility.getKeywordFieldValues());
+                context.setVariable(key.name(), submissionHelperUtility.getSubjectFieldValues());
                 break;
             case DEPARTMENT:
                 context.setVariable(key.name(), submissionHelperUtility.getDepartment());

From c3417a90c0c56e7ba89610ac7e320c3b96dc6139 Mon Sep 17 00:00:00 2001
From: cstarcher <cstarcher@gmail.com>
Date: Wed, 8 Jul 2026 15:15:47 -0500
Subject: [PATCH 4/4] fix test error

---
 .../vireo/model/export/enums/MarcXML21KeyTest.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/tdl/vireo/model/export/enums/MarcXML21KeyTest.java b/src/test/java/org/tdl/vireo/model/export/enums/MarcXML21KeyTest.java
index d871f88c3d..52743751be 100644
--- a/src/test/java/org/tdl/vireo/model/export/enums/MarcXML21KeyTest.java
+++ b/src/test/java/org/tdl/vireo/model/export/enums/MarcXML21KeyTest.java
@@ -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)
         );
     }