Merge #405 from '402-encodeMarcXmlTypeLiteralAsAttribute' of https://github.com/metafacture/metafacture-core

Author: dr0i

metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlEncoder.java

@@ -39,12 +39,15 @@
 @Out(String.class)
 @FluxCommand("encode-marcxml")
 public final class MarcXmlEncoder extends DefaultStreamPipe<ObjectReceiver<String>> {
+
     private static final String ROOT_OPEN = "<marc:collection xmlns:marc=\"http://www.loc.gov/MARC21/slim\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd\">";
     private static final String ROOT_CLOSE = "</marc:collection>";
 
     private static final String RECORD_OPEN = "<marc:record>";
     private static final String RECORD_CLOSE = "</marc:record>";
 
+    private static final String ATTRIBUTE_TEMPLATE = " %s=\"%s\"";
+
     private static final String CONTROLFIELD_OPEN_TEMPLATE = "<marc:controlfield tag=\"%s\">";
     private static final String CONTROLFIELD_CLOSE = "</marc:controlfield>";
 
@@ -81,6 +84,7 @@ public final class MarcXmlEncoder extends DefaultStreamPipe<ObjectReceiver<Strin
 
     private String currentEntity;
     private int indentationLevel;
+    private int recordAttributeOffset;
     private boolean formatted;
 
     public MarcXmlEncoder() {
@@ -134,6 +138,7 @@ public void startRecord(final String identifier) {
 
         prettyPrintIndentation();
         writeRaw(RECORD_OPEN);
+        recordAttributeOffset = builder.length() - 1;
         prettyPrintNewLine();
 
         incrementIndentationLevel();
@@ -182,7 +187,12 @@ public void endEntity() {
     @Override
     public void literal(final String name, final String value) {
         if ("".equals(currentEntity)) {
-            if (!writeLeader(name, value)) {
+            if (name.equals(Marc21EventNames.MARCXML_TYPE_LITERAL)) {
+                if (value != null) {
+                    builder.insert(recordAttributeOffset, String.format(ATTRIBUTE_TEMPLATE, name, value));
+                }
+            }
+            else if (!writeLeader(name, value)) {
                 prettyPrintIndentation();
                 writeRaw(String.format(CONTROLFIELD_OPEN_TEMPLATE, name));
                 if (value != null) {
@@ -199,7 +209,6 @@ else if (!writeLeader(currentEntity, value)) {
             writeRaw(SUBFIELD_CLOSE);
             prettyPrintNewLine();
         }
-
     }
 
     @Override
@@ -276,5 +285,7 @@ private void prettyPrintNewLine() {
     private void sendAndClearData() {
         getReceiver().process(builder.toString());
         builder.delete(0, builder.length());
+        recordAttributeOffset = 0;
     }
+
 }

metafacture-biblio/src/test/java/org/metafacture/biblio/marc21/MarcXmlEncoderTest.java

@@ -34,8 +34,7 @@
  */
 
 public class MarcXmlEncoderTest {
-    private static StringBuilder resultCollector;
-    private static MarcXmlEncoder encoder;
+
     private static final String XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
     private static final String XML_1_DECLARATION = "<?xml version=\"1.1\" encoding=\"UTF-8\"?>";
     private static final String XML_16_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>";
@@ -48,6 +47,9 @@ public class MarcXmlEncoderTest {
     private static final String XML_MARC_COLLECTION_END_TAG = "</marc:collection>";
     private static final String RECORD_ID = "92005291";
 
+    private static StringBuilder resultCollector;
+    private static MarcXmlEncoder encoder;
+
     @Before
     public void setUp() {
         encoder = new MarcXmlEncoder();
@@ -219,14 +221,60 @@ public void sendAndClearDataWhenOnResetStream() {
 
     @Test
     public void shouldIgnoreNullValueOfLiteral() {
+        encoder.startRecord(RECORD_ID);
+        encoder.literal("data", null);
+        encoder.endRecord();
+        encoder.closeStream();
+        String expected = XML_DECLARATION + XML_ROOT_OPEN
+                + "<marc:record><marc:controlfield tag=\"data\"></marc:controlfield></marc:record>"
+                + XML_MARC_COLLECTION_END_TAG;
+        String actual = resultCollector.toString();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void shouldIgnoreNullValueOfTypeLiteral() {
         encoder.startRecord(RECORD_ID);
         encoder.literal("type", null);
         encoder.endRecord();
         encoder.closeStream();
         String expected = XML_DECLARATION + XML_ROOT_OPEN
-                + "<marc:record><marc:controlfield tag=\"type\"></marc:controlfield></marc:record>"
+                + "<marc:record></marc:record>"
+                + XML_MARC_COLLECTION_END_TAG;
+        String actual = resultCollector.toString();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void issue402_shouldEncodeTypeLiteralAsAttribute() {
+        encoder.startRecord(RECORD_ID);
+        encoder.literal("type", "value");
+        encoder.endRecord();
+        encoder.closeStream();
+        String expected = XML_DECLARATION + XML_ROOT_OPEN
+                + "<marc:record type=\"value\"></marc:record>"
                 + XML_MARC_COLLECTION_END_TAG;
         String actual = resultCollector.toString();
         assertEquals(expected, actual);
     }
+
+    @Test
+    public void shouldNotEncodeNestedTypeLiteralAsAttribute() {
+        encoder.startRecord(RECORD_ID);
+        encoder.startEntity("tag12");
+        encoder.literal("type", "value");
+        encoder.endEntity();
+        encoder.endRecord();
+        encoder.closeStream();
+        String expected = XML_DECLARATION + XML_ROOT_OPEN
+                + "<marc:record>"
+                + "<marc:datafield tag=\"tag\" ind1=\"1\" ind2=\"2\">"
+                + "<marc:subfield code=\"type\">value</marc:subfield>"
+                + "</marc:datafield>"
+                + "</marc:record>"
+                + XML_MARC_COLLECTION_END_TAG;
+        String actual = resultCollector.toString();
+        assertEquals(expected, actual);
+    }
+
 }