#110 fixed

Author: mgeipel

src/main/java/org/culturegraph/mf/morph/MorphBuilder.java

@@ -18,6 +18,7 @@
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.culturegraph.mf.exceptions.MorphDefException;
 import org.culturegraph.mf.morph.collectors.Collect;
@@ -38,6 +39,9 @@ public final class MorphBuilder extends AbstractMetamorphDomWalker {
 	private static final String JAVA = "java";
 	private static final String JAVAMAP = "javamap";
 	private static final String RECORD = "record";
+	private static final String OR_STRING = "|";
+	private static final Pattern OR_PATTERN = Pattern.compile(OR_STRING, Pattern.LITERAL);
+
 	// private final String morphDef;
 	private final Metamorph metamorph;
 	private final Deque<Collect> collectStack;
@@ -80,18 +84,18 @@ protected void handleMapClass(final Node mapNode) {
 		final Map<String, String> attributes = resolvedAttributeMap(mapNode);
 		final String mapName = resolveVars(attributes.remove(ATTRITBUTE.NAME.getString()));
 		final Map<String, String> map;
-		
+
 		if (mapNode.getLocalName().equals(JAVAMAP)) {
 			final String className = resolvedAttribute(mapNode, ATTRITBUTE.CLASS);
 			map = ObjectFactory.newInstance(ObjectFactory.loadClass(className, Map.class));
 			attributes.remove(ATTRITBUTE.CLASS.getString());
 			ObjectFactory.applySetters(map, attributes);
-		}else if (getMapFactory().containsKey(mapNode.getLocalName())){
+		} else if (getMapFactory().containsKey(mapNode.getLocalName())) {
 			map = getMapFactory().newInstance(mapNode.getLocalName(), attributes);
-		}else{
+		} else {
 			throw new IllegalArgumentException("Map " + mapNode.getLocalName() + NOT_FOUND);
 		}
-		
+
 		metamorph.putMap(mapName, map);
 	}
 
@@ -135,7 +139,7 @@ protected void enterData(final Node dataNode) {
 		data = new Data();
 		data.setName(resolvedAttribute(dataNode, ATTRITBUTE.NAME));
 		metamorph.registerNamedValueReceiver(source, data);
-		
+
 		if (setEntityName) {
 			((Entity) collectStack.peek()).setNameSource(data);
 			setEntityName = false;
@@ -149,16 +153,16 @@ protected void exitData(final Node node) {
 		} else {
 			final Collect parent = collectStack.peek();
 			data.endPipe(parent);
-			parent.addNamedValueSource(data);			
+			parent.addNamedValueSource(data);
 		}
-		data = null;		
+		data = null;
 	}
-	
+
 	@Override
 	protected void enterName(final Node nameNode) {
 		setEntityName = true;
 	}
-	
+
 	@Override
 	protected void exitName(final Node nameNode) {
 		setEntityName = false;
@@ -179,7 +183,7 @@ protected void enterCollect(final Node node) {
 			((Entity) collectStack.peek()).setNameSource(collect);
 			setEntityName = false;
 		}
-		
+
 		collectStack.push(collect);
 	}
 
@@ -202,13 +206,14 @@ protected void exitCollect(final Node node) {
 	}
 
 	private void registerFlush(final String flushWith, final FlushListener flushListener) {
-
-		if (flushWith.equals(RECORD)) {
-			metamorph.registerRecordEndFlush(flushListener);
-		} else {
-			metamorph.registerNamedValueReceiver(flushWith, new Flush(flushListener));
+		final String[] keysSplit = OR_PATTERN.split(flushWith);
+		for (String key : keysSplit) {
+			if (key.equals(RECORD)) {
+				metamorph.registerRecordEndFlush(flushListener);
+			} else {
+				metamorph.registerNamedValueReceiver(key, new Flush(flushListener));
+			}
 		}
-
 	}
 
 	@Override

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

@@ -97,4 +97,37 @@
 			</cgxml:cgxml>
 		</result>
 	</test-case>
+
+	<test-case name="issue110">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="L" value="V" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<mm:metamorph version="1">
+				<mm:rules>
+					<mm:choose name="chosen" flushWith="record|entity">
+						<mm:data source="entity.data1" />
+						<mm:data source="L" />
+					</mm:choose>
+				</mm:rules>
+			</mm:metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="chosen" value="V" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
 </metamorph-test>