Added multiline support to FormetaReader.

Changed the `FormetaReader` to use `FormetaRecordsReader` for
record plitting instead of the `LineReader` module. This allows to
process sequences of multi-line formeta records.

Author: cboehme

src/main/java/org/culturegraph/mf/stream/reader/FormetaReader.java

@@ -16,14 +16,15 @@
 package org.culturegraph.mf.stream.reader;
 
 import org.culturegraph.mf.stream.converter.FormetaDecoder;
+import org.culturegraph.mf.stream.converter.FormetaRecordsReader;
 
 /**
  * @author Markus Geipel
  */
 public class FormetaReader extends ReaderBase<FormetaDecoder> {
 
 	public FormetaReader() {
-		super(new FormetaDecoder());
+		super(new FormetaRecordsReader(), new FormetaDecoder());
 	}
 
 }

src/main/java/org/culturegraph/mf/stream/reader/ReaderBase.java

@@ -16,6 +16,7 @@
 package org.culturegraph.mf.stream.reader;
 
 import org.culturegraph.mf.framework.ObjectPipe;
+import org.culturegraph.mf.framework.ObjectReceiver;
 import org.culturegraph.mf.framework.StreamReceiver;
 import org.culturegraph.mf.stream.converter.LineReader;
 
@@ -25,18 +26,23 @@
  *
  * @param <D> type of the decoder used
  */
-public class ReaderBase<D extends ObjectPipe<String, StreamReceiver>> implements Reader { 
-	private final LineReader lineReader;
+public class ReaderBase<D extends ObjectPipe<String, StreamReceiver>> implements Reader {
+	private final ObjectPipe<java.io.Reader, ObjectReceiver<String>> recordReader;
 	private final D decoder;
-	
-	public ReaderBase(final D decoder) {
+
+	public ReaderBase(final ObjectPipe<java.io.Reader, ObjectReceiver<String>> recordReader,
+			final D decoder) {
 		super();
-		
+
+		this.recordReader = recordReader;
 		this.decoder = decoder;
-		lineReader = new LineReader();
-		lineReader.setReceiver(this.decoder);
+		this.recordReader.setReceiver(this.decoder);
+	}
+
+	public ReaderBase(final D decoder) {
+		this(new LineReader(), decoder);
 	}
-	
+
 	public final D getDecoder() {
 		return decoder;
 	}
@@ -46,10 +52,10 @@ public final <R extends StreamReceiver> R setReceiver(final R receiver) {
 		decoder.setReceiver(receiver);
 		return receiver;
 	}
-	
+
 	@Override
 	public final void process(final java.io.Reader reader) {
-		lineReader.process(reader);
+		recordReader.process(reader);
 	}
 
 	@Override
@@ -59,12 +65,12 @@ public final void read(final String entry) {
 
 	@Override
 	public final void resetStream() {
-		lineReader.resetStream();
+		recordReader.resetStream();
 	}
-	
+
 	@Override
 	public final void closeStream() {
-		lineReader.closeStream();
+		recordReader.closeStream();
 	}
-	
+
 }

src/main/resources/metastream-readers.properties

@@ -14,4 +14,5 @@ text/x-pica org.culturegraph.mf.stream.reader.PicaReader
 text/x-mab2 org.culturegraph.mf.stream.reader.MabReader
 text/x-marc21 org.culturegraph.mf.stream.reader.MarcReader
 text/x-cg+xml org.culturegraph.mf.stream.reader.CGXmlReader
+text/x-formeta org.culturegraph.mf.stream.reader.FormetaReader
 application/x-cgentity org.culturegraph.mf.stream.reader.CGEntityReader