Don't duplicate element value when adding it as a subfield

See #312

Author: fsteeg

metafacture-html/src/main/java/org/metafacture/html/HtmlDecoder.java

@@ -82,14 +82,15 @@ private void process(Element parent, StreamReceiver receiver) {
         for (Element element : parent.children()) {
             receiver.startEntity(element.nodeName());
             Attributes attributes = element.attributes();
+            boolean addedValueAsSubfield = false;
             for (Attribute attribute : attributes) {
-                handleAttributeValuesAsSubfields(receiver, element, attributes, attribute);
+                addedValueAsSubfield = handleAttributeValuesAsSubfields(receiver, element, attributes, attribute);
                 receiver.literal(attribute.getKey(), attribute.getValue());
             }
             if (element.children().isEmpty()) {
                 String text = element.text().trim();
                 String value = text.isEmpty() ? element.data() : text;
-                if (!value.isEmpty()) {
+                if (!value.isEmpty() && !addedValueAsSubfield) {
                     receiver.literal("value", value);
                 }
             }
@@ -98,18 +99,20 @@ private void process(Element parent, StreamReceiver receiver) {
         }
     }
 
-    private void handleAttributeValuesAsSubfields(StreamReceiver receiver, Element element,
+    private boolean handleAttributeValuesAsSubfields(StreamReceiver receiver, Element element,
             Attributes attributes, Attribute attribute) {
         String fullFieldKey = element.nodeName() + "." + attribute.getKey();
         if (attrValsAsSubfields.containsKey(fullFieldKey)) {
             String configValue = attrValsAsSubfields.get(fullFieldKey);
             if (configValue.trim().isEmpty()) {
                 receiver.literal(attribute.getValue(), element.text().trim());
+                return true;
             } else {
                 String value = attributes.get(configValue);
                 receiver.literal(attribute.getValue(), value);
             }
         }
+        return false;
     }
 
     public void setAttrValsAsSubfields(String mapString) {
@@ -128,4 +131,5 @@ public void setAttrValsAsSubfields(String mapString) {
             }
         }
     }
+
 }

metafacture-html/src/test/java/org/metafacture/html/HtmlDecoderTest.java

@@ -17,6 +17,7 @@
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.never;
 
 import java.io.StringReader;
 
@@ -103,16 +104,19 @@ public void htmlAttributesAsSubfieldsDefault() {
         final InOrder ordered = inOrder(receiver);
         ordered.verify(receiver).startEntity("meta");
         ordered.verify(receiver).literal("language", "DE");
+        ordered.verify(receiver).literal("name", "language");
+        ordered.verify(receiver).literal("content", "DE");
         ordered.verify(receiver, times(4)).endEntity();
     }
-    
+
     @Test
     public void htmlAttributesAsSubfieldsCustom() {
         htmlDecoder.setAttrValsAsSubfields("mods:url.access");
         htmlDecoder.process(new StringReader("<mods:url access=\"preview\">file:///img.png</mods:url>"));
         final InOrder ordered = inOrder(receiver);
         ordered.verify(receiver).startEntity("mods:url");
         ordered.verify(receiver).literal("preview", "file:///img.png");
+        ordered.verify(receiver, never()).literal("value", "file:///img.png");
         ordered.verify(receiver, times(3)).endEntity();
     }
 
@@ -126,6 +130,7 @@ public void htmlAttributesAsSubfieldsDefaultPlusCustom() {
         ordered.verify(receiver).literal("language", "DE");
         ordered.verify(receiver).startEntity("mods:url");
         ordered.verify(receiver).literal("preview", "file:///img.png");
+        ordered.verify(receiver, never()).literal("value", "file:///img.png");
         ordered.verify(receiver, times(3)).endEntity();
     }
 }