Merge #556 from branch '550-prettyIndentMarcLeader' of github.com:met…

…afacture/metafacture-core
metafacture · Sep 6, 2024 · fee2bcb · fee2bcb
2 parents 57f9344 + 066a483
commit fee2bcb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlEncoder.java b/metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlEncoder.java
@@ -437,11 +437,17 @@ private void writeEscaped(final String str) {
         private void writeLeader() {
             final String leader = leaderBuilder.toString();
             if (leaderBuilder.length() > 0) {
-                prettyPrintIndentation();
+                if (formatted) {
+                    writeRawLeader(getIndentationPrefix());
+                }
+
                 writeTagLeader(Tag.leader::open);
                 writeRawLeader(leader);
                 writeTagLeader(Tag.leader::close);
-                prettyPrintNewLine();
+
+                if (formatted) {
+                    writeRawLeader(NEW_LINE);
+                }
             }
         }
 
@@ -455,10 +461,13 @@ private void writeTagLeader(final Function<Object[], String> function) {
             writeRawLeader(function.apply(namespacePrefix));
         }
 
+        private String getIndentationPrefix() {
+            return String.join("", Collections.nCopies(indentationLevel, INDENT));
+        }
+
         private void prettyPrintIndentation() {
             if (formatted) {
-                final String prefix = String.join("", Collections.nCopies(indentationLevel, INDENT));
-                builder.append(prefix);
+                builder.append(getIndentationPrefix());
             }
         }
 

diff --git a/metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlEncoderTest.java b/metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlEncoderTest.java
@@ -130,10 +130,19 @@ public void createAnEmptyRecord() {
     @Test
     public void createARecordPrettyPrint() {
         encoder.setFormatted(true);
-        addOneRecord(encoder);
+        encoder.startRecord(RECORD_ID);
+        encoder.startEntity(Marc21EventNames.LEADER_ENTITY);
+        encoder.literal(Marc21EventNames.LEADER_ENTITY, "dummy");
+        encoder.endEntity();
+        encoder.literal("001", RECORD_ID);
+        encoder.startEntity("010  ");
+        encoder.literal("a", RECORD_ID);
+        encoder.endEntity();
+        encoder.endRecord();
         encoder.closeStream();
-        String expected = XML_DECLARATION + "\n" + XML_ROOT_OPEN + "\n"// " <marc:record>\n"
+        String expected = XML_DECLARATION + "\n" + XML_ROOT_OPEN + "\n"
                 + "\t<marc:record>\n"//
+                + "\t\t<marc:leader>dummy</marc:leader>\n"
                 + "\t\t<marc:controlfield tag=\"001\">92005291</marc:controlfield>\n"//
                 + "\t\t<marc:datafield tag=\"010\" ind1=\" \" ind2=\" \">\n"//
                 + "\t\t\t<marc:subfield code=\"a\">92005291</marc:subfield>\n"//