ods piped output

git-svn-id: https://subversion.renater.fr/xtandempipeline/trunk@372 b8ef2a07-7df7-436f-90b9-41648038564b

xtandempipeline/src/fr/inra/pappso/xtandempipeline/output/CsvRedundantPeptideOutput.java

@@ -23,18 +23,11 @@
 
 package fr.inra.pappso.xtandempipeline.output;
 
-import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.stream.XMLStreamException;
 
 import org.apache.log4j.Logger;
 
 import fr.inra.pappso.csv2ods.Ods2Csv;
-import fr.inra.pappso.libodsstream.OdsDocWriter;
 import fr.inra.pappso.xtandempipeline.MsException.MSMSException;
 
 public class CsvRedundantPeptideOutput extends OdsRedundantPeptideOutput {
@@ -44,29 +37,12 @@ public class CsvRedundantPeptideOutput extends OdsRedundantPeptideOutput {
 
 	public CsvRedundantPeptideOutput(OutputStream outputStream)
 			throws MSMSException {
+		ods2csv = new Ods2Csv();
 		try {
-
-			PipedOutputStream pos = new PipedOutputStream();
-			PipedInputStream pis = new PipedInputStream(pos);
-
-			odsTable = new OdsDocWriter(pos);
-
-			ods2csv = new Ods2Csv();
-			ods2csv.setSourceInputStream(pis);
-			ods2csv.setSinkOutputStream(outputStream);
-			//ods2csv.setSeparator('\t');
-			 (new Thread(ods2csv)).start();
-			//ods2csv.run();
-		} catch (IOException e) {
-			String message = "IOException " + e.getMessage();
-			logger.error(message);
-			throw new MSMSException(message);
-		} catch (XMLStreamException e) {
-			String message = "XMLStreamException " + e.getMessage();
-			logger.error(message);
-			throw new MSMSException(message);
-		} catch (DatatypeConfigurationException e) {
-			String message = "DatatypeConfigurationException " + e.getMessage();
+			odsTable = ods2csv.getOdsDocPipedOutput(outputStream);
+		} catch (Exception e) {
+			String message = "error getting OdsDocPipedOutput "
+					+ e.getMessage();
 			logger.error(message);
 			throw new MSMSException(message);
 		}