Fixed #177: Condition was not reset when collector was reset

If a collector has an reset="true" attribute one would expect that this
also resets the state of an if-condition in the collector. However, this
was not the case. This commits fixes this.

Please note that this may change the behaviour of existing scripts if
they relied on the condition not being reset with the reset of the
collector.

Author: cboehme

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

@@ -21,7 +21,7 @@
 
 /**
  * Common basis for {@link Entity}, {@link Combine} etc.
- * 
+ *
  * @author Markus Michael Geipel
  * @author Christoph Böhme
  *
@@ -37,9 +37,9 @@ public abstract class AbstractCollect extends AbstractNamedValuePipeHead impleme
 	private final Metamorph metamorph;
 	private boolean waitForFlush;
 	private boolean conditionMet;
-	
+
 	private NamedValueSource conditionSource;
-	
+
 	public AbstractCollect(final Metamorph metamorph) {
 		super();
 		this.metamorph = metamorph;
@@ -60,11 +60,15 @@ protected final int getEntityCount() {
 	protected final boolean isConditionMet() {
 		return conditionMet;
 	}
-	
+
 	protected final void setConditionMet(final boolean conditionMet) {
 		this.conditionMet = conditionMet;
 	}
-	
+
+	protected final void resetCondition() {
+		setConditionMet(conditionSource == null);
+	}
+
 	@Override
 	public final void setWaitForFlush(final boolean waitForFlush) {
 		this.waitForFlush = waitForFlush;
@@ -75,7 +79,7 @@ public final void setWaitForFlush(final boolean waitForFlush) {
 	public final void setSameEntity(final boolean sameEntity) {
 		this.sameEntity = sameEntity;
 	}
-	
+
 	public final boolean getReset() {
 		return resetAfterEmit;
 	}
@@ -98,9 +102,9 @@ public final void setName(final String name) {
 	@Override
 	public final void setConditionSource(final NamedValueSource conditionSource) {
 		this.conditionSource = conditionSource;
-		this.conditionMet = conditionSource == null;
+		resetCondition();
 	}
-	
+
 	public final String getValue() {
 		return value;
 	}
@@ -115,7 +119,7 @@ public final void setValue(final String value) {
 
 	protected final void updateCounts(final int currentRecord, final int currentEntity) {
 		if (!isSameRecord(currentRecord)) {
-			conditionMet = conditionSource == null;
+			resetCondition();
 			clear();
 			oldRecord = currentRecord;
 		}
@@ -138,16 +142,17 @@ public final void receive(final String name, final String value, final NamedValu
 			final int recordCount, final int entityCount) {
 
 		updateCounts(recordCount, entityCount);
-		
+
 		if (source == conditionSource) {
 			conditionMet = true;
 		} else {
 			receive(name, value, source);
 		}
-		
+
 		if (!waitForFlush && isConditionMet() && isComplete()) {
 			emit();
 			if (resetAfterEmit) {
+				resetCondition();
 				clear();
 			}
 		}

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

@@ -19,7 +19,7 @@
 
 /**
  * Common basis for {@link Entity}, {@link Combine} etc.
- * 
+ *
  * @author Markus Michael Geipel
  * @author Christoph Böhme
  *
@@ -32,12 +32,13 @@ public abstract class AbstractFlushingCollect extends AbstractCollect {
 	public AbstractFlushingCollect(final Metamorph metamorph) {
 		super(metamorph);
 	}
-	
+
 	@Override
 	public final void flush(final int recordCount, final int entityCount) {
 		if (isSameRecord(recordCount) && sameEntityConstraintSatisfied(entityCount) && isConditionMet()) {
 			emit();
 			if (getReset()) {
+				resetCondition();
 				clear();
 			}
 		}

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

@@ -21,7 +21,7 @@
 
 /**
  * Corresponds to the <code>&lt;none&gt;</code> tag.
- * 
+ *
  * @author Christoph Böhme <c.boehme@dnb.de>
  *
  */
@@ -32,7 +32,7 @@ public final class None extends AbstractCollect {
 
 	private boolean receivedInput;
 	private boolean emittedResult;
-	
+
 	public None(final Metamorph metamorph) {
 		super(metamorph);
 		setNamedValueReceiver(metamorph);

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

@@ -267,4 +267,46 @@
 		</result>
 	</test-case>
 
+	<test-case name="should reset condition with collector">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:entity name="entity">
+							<cgxml:literal name="data1" value="output" />
+							<cgxml:literal name="data2" value="X" />
+						</cgxml:entity>
+						<cgxml:entity name="entity">
+							<cgxml:literal name="data1" value="no-output" />
+							<cgxml:literal name="data3" value="X" />
+						</cgxml:entity>
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<metamorph version="1" xmlns="http://www.culturegraph.org/metamorph">
+				<rules>
+					<combine name="result" value="${VAL}" reset="true">
+						<if>
+							<data source="entity.data2" />
+						</if>
+						<data source="entity.data1" name="VAL" />
+					</combine>
+				</rules>
+			</metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="result" value="output" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
+
 </metamorph-test>