Improve MarcXmlEncoer to work also with Metamorph 1.1

Author: dr0i

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

@@ -144,10 +144,10 @@ public void startEntity(final String name) {
         currentEntity = name;
         if (!name.equals(Marc21EventNames.LEADER_ENTITY)) {
             if (name.length() != 5) {
-                String message = String.format("Entity too short." + "Got a string ('%s') of length %d."
-                        + "Expected a length of 5 (field + indicators).", name, name.length());
-                throw new MetafactureException(message);
-            }
+                 String message = String.format("Entity too short." + "Got a string ('%s') of length %d."
+                         + "Expected a length of 5 (field + indicators).", name, name.length());
+                 throw new MetafactureException(message);
+             }
 
             String tag = name.substring(0, 3);
             String ind1 = name.substring(3, 4);
@@ -156,7 +156,10 @@ public void startEntity(final String name) {
             writeRaw(String.format(DATAFIELD_OPEN_TEMPLATE, tag, ind1, ind2));
             prettyPrintNewLine();
             incrementIndentationLevel();
-        }
+        } else { prettyPrintIndentation();
+        writeRaw(LEADER_OPEN_TEMPLATE);
+    }
+
     }
 
     @Override
@@ -172,22 +175,23 @@ public void endEntity() {
 
     @Override
     public void literal(final String name, final String value) {
+        if (value == null || value.isEmpty())
+        return;
         if (currentEntity.equals("")) {
             prettyPrintIndentation();
-            writeRaw(String.format(CONTROLFIELD_OPEN_TEMPLATE, name));
+            writeRaw(String.format(CONTROLFIELD_OPEN_TEMPLATE, name.replaceFirst("\\W","")));
             writeEscaped(value.trim());
             writeRaw(CONTROLFIELD_CLOSE);
             prettyPrintNewLine();
         } else if (!currentEntity.equals(Marc21EventNames.LEADER_ENTITY)) {
             prettyPrintIndentation();
-            writeRaw(String.format(SUBFIELD_OPEN_TEMPLATE, name));
+            writeRaw(String.format(SUBFIELD_OPEN_TEMPLATE, name.charAt(name.indexOf('.')+1)));
             writeEscaped(value.trim());
             writeRaw(SUBFIELD_CLOSE);
             prettyPrintNewLine();
         } else {
-            if (name.equals(Marc21EventNames.LEADER_ENTITY)) {
-                prettyPrintIndentation();
-                writeRaw(LEADER_OPEN_TEMPLATE + value + LEADER_CLOSE_TEMPLATE);
+            {
+               writeRaw(value + LEADER_CLOSE_TEMPLATE);
                 prettyPrintNewLine();
             }
         }
@@ -241,8 +245,8 @@ private void writeEscaped(final String str) {
 
     private void prettyPrintIndentation() {
         if (formatted) {
-            String prefix = String.join("", Collections.nCopies(indentationLevel, INDENT));
-            builder.append(prefix);
+          String prefix = String.join("", Collections.nCopies(indentationLevel, INDENT));
+          builder.append(prefix);
         }
     }
 
@@ -256,4 +260,4 @@ private void sendAndClearData() {
         getReceiver().process(builder.toString());
         builder.delete(0, builder.length());
     }
-}
+}