Reset name to default on reset.

Author: cboehme

src/main/java/org/culturegraph/mf/morph/collectors/Entity.java

@@ -25,6 +25,7 @@
 import org.culturegraph.mf.morph.NamedValueReceiver;
 import org.culturegraph.mf.morph.NamedValueSource;
 import org.culturegraph.mf.stream.pipe.StreamBuffer;
+import org.culturegraph.mf.util.StringUtil;
 
 
 
@@ -43,6 +44,7 @@ public final class Entity extends AbstractCollect {
 	private final StreamBuffer buffer = new StreamBuffer();
 
 	private NamedValueSource nameSource;
+	private String currentName;
 
 	public Entity(final Metamorph metamorph) {
 		super(metamorph);
@@ -66,7 +68,7 @@ protected void emit() {
 	private void write(final StreamReceiver receiver) {
 		if (!buffer.isEmpty()) {
 
-			receiver.startEntity(getName());
+			receiver.startEntity(StringUtil.fallback(currentName, getName()));
 			buffer.setReceiver(receiver);
 			buffer.replay();
 			receiver.endEntity();
@@ -79,7 +81,7 @@ private void write(final StreamReceiver receiver) {
 	@Override
 	protected void receive(final String name, final String value, final NamedValueSource source) {
 		if (source == nameSource) {
-			setName(value);
+			currentName = value;
 		} else if (source instanceof Entity) {
 			final Entity child = (Entity) source;
 			child.write(buffer);
@@ -98,6 +100,7 @@ protected boolean isComplete() {
 	protected void clear() {
 		sourcesLeft.addAll(sourceList);
 		buffer.clear();
+		currentName = null;
 	}
 
 	@Override

src/test/java/org/culturegraph/mf/morph/collectors/EntityTest.xml

@@ -371,4 +371,51 @@
 		</result>
 	</test-case>
 
+		<test-case name="shouldResetNameToNameAttribute">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1x">
+						<cgxml:literal name="data1" value="a" />
+						<cgxml:literal name="data3" value="dynamicName" />
+					</cgxml:record>
+					<cgxml:record id="2x">
+
+						<cgxml:literal name="data1" value="b" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<mm:metamorph version="1">
+				<mm:rules>
+					<mm:entity name="defaultName" flushWith="record">
+						<mm:entity-name>
+							<mm:data source="data3" />
+						</mm:entity-name>
+						<mm:data source="data1" name="l1" />
+					</mm:entity>
+				</mm:rules>
+			</mm:metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1x">
+						<cgxml:entity name="dynamicName">
+							<cgxml:literal name="l1" value="a" />
+						</cgxml:entity>
+					</cgxml:record>
+					<cgxml:record id="2x">
+						<cgxml:entity name="defaultName">
+							<cgxml:literal name="l1" value="b" />
+						</cgxml:entity>
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
+	
 </metamorph-test>