Fix #257: Do not reset entity if reset is false

Author: cboehme

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

@@ -64,15 +64,11 @@ protected void emit() {
 
 	private void write(final StreamReceiver receiver) {
 		if (!buffer.isEmpty()) {
-
 			receiver.startEntity(StringUtil.fallback(currentName, getName()));
 			buffer.setReceiver(receiver);
 			buffer.replay();
 			receiver.endEntity();
-
-			buffer.clear();
 		}
-
 	}
 
 	@Override

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

@@ -452,4 +452,85 @@
 		</result>
 	</test-case>
 
+	<test-case name="should emit entity contents again if reset is false">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="lit1" value="const" />
+						<cgxml:literal name="lit2" value="1" />
+						<cgxml:literal name="lit2" value="2" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<mm:metamorph version="1">
+				<mm:rules>
+					<mm:entity name="entity">
+						<mm:data source="lit1" />
+						<mm:data source="lit2" />
+					</mm:entity>
+				</mm:rules>
+			</mm:metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:entity name="entity">
+							<cgxml:literal name="lit1" value="const" />
+							<cgxml:literal name="lit2" value="1" />
+						</cgxml:entity>
+						<cgxml:entity name="entity">
+							<cgxml:literal name="lit1" value="const" />
+							<cgxml:literal name="lit2" value="1" />
+							<cgxml:literal name="lit2" value="2" />
+						</cgxml:entity>
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
+
+	<test-case name="should not emit entity contents again if reset is false">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="lit1" value="const" />
+						<cgxml:literal name="lit2" value="1" />
+						<cgxml:literal name="lit2" value="2" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<mm:metamorph version="1">
+				<mm:rules>
+					<mm:entity name="entity" reset="true">
+						<mm:data source="lit1" />
+						<mm:data source="lit2" />
+					</mm:entity>
+				</mm:rules>
+			</mm:metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:entity name="entity">
+							<cgxml:literal name="lit1" value="const" />
+							<cgxml:literal name="lit2" value="1" />
+						</cgxml:entity>
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
+
 </metamorph-test>