Added an <any> statement to metamorph.

The statement implements a existential quantor or disjunction operation
(logical or-operation). It allows for checking whether at least one of
the statements contained in the <any> statement generated an output.
Using the <any> statement disjunctions can be written in a more
expressive way than (ab)using the <combine> statement allows.

By default the <any> statement outputs an unamed literal with "true" as
value. However, this can be customized.

<any name="MyCustomName" value="one-fired">
	<data source="data1" />
	<data source="data2" />
</any>

The <any> statement supports reset and flushWith.

Conflicts:
	src/test/java/org/culturegraph/mf/morph/collectors/CollectorTest.java

Author: cboehme

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

@@ -27,9 +27,6 @@
  */
 public abstract class AbstractCollect extends AbstractNamedValuePipeHead implements Collect {
 
-//private static final String FLUSH = "_flush";
-//	private static final Logger LOG = LoggerFactory.getLogger(AbstractCollect.class);
-
 	private int oldRecord;
 	private int oldEntity;
 	private boolean resetAfterEmit;
@@ -39,13 +36,12 @@ public abstract class AbstractCollect extends AbstractNamedValuePipeHead impleme
 	private final Metamorph metamorph;
 	private boolean waitForFlush;
 
-
 	public AbstractCollect(final Metamorph metamorph) {
 		super();
 		this.metamorph = metamorph;
 	}
-	
-	protected final Metamorph getMetamorph(){
+
+	protected final Metamorph getMetamorph() {
 		return metamorph;
 	}
 
@@ -63,33 +59,30 @@ public final void setWaitForFlush(final boolean waitForFlush) {
 		//metamorph.addEntityEndListener(this, flushEntity);
 	}
 
-
-	
 	@Override
 	public final void setSameEntity(final boolean sameEntity) {
 		this.sameEntity = sameEntity;
 	}
-
+	
+	public final boolean getReset() {
+		return resetAfterEmit;
+	}
 
 	@Override
 	public final void setReset(final boolean reset) {
 		this.resetAfterEmit = reset;
 	}
 
-
-	
 	@Override
 	public final String getName() {
 		return name;
 	}
 
-	
 	@Override
 	public final void setName(final String name) {
 		this.name = name;
 	}
 
-
 	public final String getValue() {
 		return value;
 	}
@@ -102,7 +95,6 @@ public final void setValue(final String value) {
 		this.value = value;
 	}
 
-
 	private void updateCounts(final int currentRecord, final int currentEntity) {
 		if (!isSameRecord(currentRecord)) {
 			clear();
@@ -118,56 +110,48 @@ private boolean resetNeedFor(final int currentEntity) {
 		return sameEntity && oldEntity != currentEntity;
 	}
 
-	private boolean isSameRecord(final int currentRecord) {
+	protected final boolean isSameRecord(final int currentRecord) {
 		return currentRecord == oldRecord;
 	}
 
 	@Override
-	public final void receive(final String name, final String value, final NamedValueSource source, final int recordCount, final int entityCount) {
-		updateCounts(recordCount, entityCount);
-
-//		if(FLUSH.equals(name)){
-//			flush(name, recordCount, entityCount);
-//		}
-		
-		receive(name, value, source);
-
-		if (!waitForFlush && isComplete()) {
-			emit();
-			if (resetAfterEmit) {
-				clear();
-			}
-		}
-	}
-
+	public final void receive(final String name, final String value, final NamedValueSource source,
+			final int recordCount, final int entityCount) {
+					updateCounts(recordCount, entityCount);
+			
+			//		if(FLUSH.equals(name)){
+			//			flush(name, recordCount, entityCount);
+			//		}
+					
+					receive(name, value, source);
+			
+					if (!waitForFlush && isComplete()) {
+						emit();
+						if (resetAfterEmit) {
+							clear();
+						}
+					}
+				}
 
 	@Override
 	public final void addNamedValueSource(final NamedValueSource namedValueSource) {
 		onNamedValueSourceAdded(namedValueSource);
 	}
 
-	protected  void onNamedValueSourceAdded(final NamedValueSource namedValueSource){
-		//nothing to do 
+	protected void onNamedValueSourceAdded(final NamedValueSource namedValueSource) {
+		//nothing to do
 	}
 
-	@Override
-	public final void flush(final int recordCount, final int entityCount) {
-		if (isSameRecord(recordCount) && sameEntityConstraintSatisfied(entityCount)) {
-			emit();
-			if (resetAfterEmit) {
-				clear();
-			}
-		}
-	}
-	
-	private boolean sameEntityConstraintSatisfied(final int entityCount) {
+	protected final boolean sameEntityConstraintSatisfied(final int entityCount) {
 		return !sameEntity || oldEntity == entityCount;
 	}
 
 	protected abstract void receive(final String name, final String value, final NamedValueSource source);
+
 	protected abstract boolean isComplete();
+
 	protected abstract void clear();
+
 	protected abstract void emit();
 
-	
-}
+}

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

@@ -0,0 +1,45 @@
+/*
+ *  Copyright 2013 Deutsche Nationalbibliothek
+ *
+ *  Licensed under the Apache License, Version 2.0 the "License";
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.culturegraph.mf.morph.collectors;
+
+import org.culturegraph.mf.morph.Metamorph;
+
+/**
+ * Common basis for {@link Entity}, {@link Combine} etc.
+ * 
+ * @author Markus Michael Geipel
+
+ */
+public abstract class AbstractFlushingCollect extends AbstractCollect {
+
+//private static final String FLUSH = "_flush";
+//	private static final Logger LOG = LoggerFactory.getLogger(AbstractCollect.class);
+
+	public AbstractFlushingCollect(final Metamorph metamorph) {
+		super(metamorph);
+	}
+	
+	@Override
+	public final void flush(final int recordCount, final int entityCount) {
+		if (isSameRecord(recordCount) && sameEntityConstraintSatisfied(entityCount)) {
+			emit();
+			if (getReset()) {
+				clear();
+			}
+		}
+	}
+
+}

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

@@ -28,7 +28,7 @@
  * @author Christoph Böhme <[email protected]>
  *
  */
-public final class All extends AbstractCollect {
+public final class All extends AbstractFlushingCollect {
 
 	private static final String DEFAULT_NAME = "";
 	private static final String DEFAULT_VALUE = "true";

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

@@ -0,0 +1,74 @@
+/*
+ *  Copyright 2013 Christoph Böhme
+ *
+ *  Licensed under the Apache License, Version 2.0 the "License";
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.culturegraph.mf.morph.collectors;
+
+import org.culturegraph.mf.morph.Metamorph;
+import org.culturegraph.mf.morph.NamedValueSource;
+import org.culturegraph.mf.util.StringUtil;
+
+/**
+ * Corresponds to the <code>&lt;any&gt;</code> tag.
+ * 
+ * @author Christoph Böhme <[email protected]>
+ *
+ */
+public final class Any extends AbstractCollect {
+
+	private static final String DEFAULT_NAME = "";
+	private static final String DEFAULT_VALUE = "true";
+
+	private boolean receivedInput;
+	private boolean emittedResult;
+	
+	public Any(final Metamorph metamorph) {
+		super(metamorph);
+		setNamedValueReceiver(metamorph);
+	}
+
+	@Override
+	protected void receive(final String name, final String value, final NamedValueSource source) {
+		receivedInput = true;
+	}
+
+	@Override
+	protected boolean isComplete() {
+		return receivedInput;
+	}
+
+	@Override
+	protected void clear() {
+		receivedInput = false;
+		emittedResult = false;
+	}
+
+	@Override
+	protected void emit() {
+		if (receivedInput && !emittedResult) {
+			final String name = StringUtil.fallback(getName(), DEFAULT_NAME);
+			final String value = StringUtil.fallback(getValue(), DEFAULT_VALUE);
+			getNamedValueReceiver().receive(name, value, this, getRecordCount(), getEntityCount());
+			emittedResult = true;
+		}
+	}
+
+	@Override
+	public void flush(final int recordCount, final int entityCount) {
+		emit();
+		receivedInput = false;
+		emittedResult = false;
+	}
+
+}

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

@@ -30,7 +30,7 @@
  * @author Christoph Böhme <[email protected]>,  Markus Michael Geipel
  *
  */
-public final class Choose extends AbstractCollect{
+public final class Choose extends AbstractFlushingCollect{
 
 	private String value;
 	private String name;

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

@@ -31,7 +31,7 @@
  * 
  * @author Markus Michael Geipel
  */
-public final class Combine extends AbstractCollect{
+public final class Combine extends AbstractFlushingCollect{
 	private final Map<String, String> variables = new HashMap<String, String>();
 	private final Set<NamedValueSource> sources = new HashSet<NamedValueSource>();
 	private final Set<NamedValueSource> sourcesLeft = new HashSet<NamedValueSource>();

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

@@ -23,7 +23,7 @@
  * 
  * @author Markus Michael Geipel
  */
-public final class Concat extends AbstractCollect{
+public final class Concat extends AbstractFlushingCollect{
 	private final StringBuilder builder = new StringBuilder();
 	private String prefix = "";
 	private String postfix = "";

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

@@ -34,7 +34,7 @@
  * 
  * @author Markus Michael Geipel
  */
-public final class Entity extends AbstractCollect {
+public final class Entity extends AbstractFlushingCollect {
 	// private static final Logger LOG = LoggerFactory.getLogger(Entity.class);
 
 	// public static final String ENTITY_NAME = "_entity_name";

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

@@ -27,16 +27,16 @@
 
 
 /**
- * Corresponds to the <code>&lt;equalsFilter-literal&gt;</code> tag. Emits data if values in variables are all equal. 
- * 
+ * Corresponds to the <code>&lt;equalsFilter-literal&gt;</code> tag. Emits data if values in variables are all equal.
+ *
  * @author Thomas Haidlas
  */
-public final class EqualsFilter extends AbstractCollect{
+public final class EqualsFilter extends AbstractFlushingCollect{
 	private final Map<String, String> variables = new HashMap<String, String>();
 	private final Set<NamedValueSource> sources = new HashSet<NamedValueSource>();
 	private final Set<NamedValueSource> sourcesLeft = new HashSet<NamedValueSource>();
-	private boolean isEqual = true; 
-	
+	private boolean isEqual = true;
+
 	public EqualsFilter(final Metamorph metamorph) {
 		super(metamorph);
 		setNamedValueReceiver(metamorph);
@@ -64,10 +64,10 @@ protected void receive(final String name, final String value, final NamedValueSo
 			this.isEqual = false;
 		}
 		this.variables.put(name, value);
-		this.sourcesLeft.remove(source);		
+		this.sourcesLeft.remove(source);
 	}
 
-	
+
 	@Override
 	public void onNamedValueSourceAdded(final NamedValueSource namedValueSource) {
 		this.sources.add(namedValueSource);

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

@@ -25,7 +25,7 @@
  * 
  * @author Markus Michael Geipel
  */
-public final class Group extends AbstractCollect{
+public final class Group extends AbstractFlushingCollect{
 
 
 	public Group(final Metamorph metamorph) {