==================================================================== */
package org.apache.poi.extractor;
+import static org.apache.poi.hssf.model.InternalWorkbook.OLD_WORKBOOK_DIR_ENTRY_NAME;
import static org.apache.poi.hssf.model.InternalWorkbook.WORKBOOK_DIR_ENTRY_NAMES;
import java.io.IOException;
import org.apache.poi.POIOLE2TextExtractor;
import org.apache.poi.POITextExtractor;
+import org.apache.poi.hssf.OldExcelFormatException;
import org.apache.poi.hssf.extractor.EventBasedExcelExtractor;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
return new ExcelExtractor(poifsDir);
}
}
+ if (poifsDir.hasEntry(OLD_WORKBOOK_DIR_ENTRY_NAME)) {
+ throw new OldExcelFormatException("Old Excel Spreadsheet format (1-95) "
+ + "found. Please call OldExcelExtractor directly for basic text extraction");
+ }
// Ask Scratchpad, or fail trying
Class<?> cls = getScratchpadClass();
Method m = cls.getDeclaredMethod("createExtractor", DirectoryNode.class);
POITextExtractor ext = (POITextExtractor)m.invoke(null, poifsDir);
if (ext != null) return ext;
+ } catch (IllegalArgumentException iae) {
+ throw iae;
} catch (Exception e) {
throw new IllegalArgumentException("Error creating Scratchpad Extractor", e);
}
import org.apache.poi.hwpf.OldWordFileFormatException;
import org.apache.poi.hwpf.extractor.Word6Extractor;
import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.xmlbeans.XmlException;
/**
* Scratchpad-specific logic for {@link OLE2ExtractorFactory} and
* Note - doesn't check for core-supported formats!
* Note - doesn't check for OOXML-supported formats
*/
- public static POITextExtractor createExtractor(DirectoryNode poifsDir) throws IOException,
- OpenXML4JException, XmlException
- {
+ public static POITextExtractor createExtractor(DirectoryNode poifsDir) throws IOException {
if (poifsDir.hasEntry("WordDocument")) {
// Old or new style word document?
try {