Merge pull request #2154 from TexasDigitalLibrary/main_marcxml21

Main marcxml21

Author: cstarcher

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,

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.getSubjectFieldValues());
+                break;
             case DEPARTMENT:
                 context.setVariable(key.name(), submissionHelperUtility.getDepartment());
                 break;

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=" " ind2=" ">
+        <subfield th:text="${ subject.getValue() }" code="a"></subfield>
+    </datafield>
+
 
-    <!-- 653, ETD subject/keywords -->
+    <!-- 653, ETD keywords -->
     <!--
         Source: documentKeywords
         Example:

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)
         );
     }