moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

ExtractorFactory: save OOXML stream into temporary file before text extraction - this reduces memory usage and allows temporary file cleanup

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@899123 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maxim Valyanskiy 2010-01-14 08:56:35 +00:00
parent 8b377f2f67
commit 2e6ffb4f7e
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
View File

@ -16,13 +16,7 @@
==================================================================== */ ==================================================================== */
package org.apache.poi.extractor; package org.apache.poi.extractor;
import java.io.ByteArrayInputStream; import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -30,6 +24,8 @@ import org.apache.poi.POIOLE2TextExtractor;
import org.apache.poi.POITextExtractor; import org.apache.poi.POITextExtractor;
import org.apache.poi.POIXMLDocument; import org.apache.poi.POIXMLDocument;
import org.apache.poi.POIXMLTextExtractor; import org.apache.poi.POIXMLTextExtractor;
import org.apache.poi.util.TempFile;
import org.apache.poi.util.IOUtils;
import org.apache.poi.hdgf.extractor.VisioTextExtractor; import org.apache.poi.hdgf.extractor.VisioTextExtractor;
import org.apache.poi.hpbf.extractor.PublisherTextExtractor; import org.apache.poi.hpbf.extractor.PublisherTextExtractor;
import org.apache.poi.hslf.extractor.PowerPointExtractor; import org.apache.poi.hslf.extractor.PowerPointExtractor;
@ -87,8 +83,21 @@ public class ExtractorFactory {
if(POIFSFileSystem.hasPOIFSHeader(inp)) { if(POIFSFileSystem.hasPOIFSHeader(inp)) {
return createExtractor(new POIFSFileSystem(inp)); return createExtractor(new POIFSFileSystem(inp));
} }
if(POIXMLDocument.hasOOXMLHeader(inp)) { if(POIXMLDocument.hasOOXMLHeader(inp)) {
return createExtractor(OPCPackage.open(inp)); File file = TempFile.createTempFile("poi-ooxml-", ".tmp");
try {
FileOutputStream out = new FileOutputStream(file);
IOUtils.copy(inp, out);
out.close();
return createExtractor(OPCPackage.open(file.getPath()));
} finally {
if (file.exists()) {
file.delete();
}
}
} }
throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream"); throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
} }