You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2011/05/15 23:17:12 UTC
svn commit: r1103546 - in
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser:
microsoft/ooxml/OOXMLExtractorFactory.java microsoft/ooxml/OOXMLParser.java
odf/OpenDocumentParser.java
Author: nick
Date: Sun May 15 21:17:12 2011
New Revision: 1103546
URL: http://svn.apache.org/viewvc?rev=1103546&view=rev
Log:
TIKA-646 Avoid calling endDocument for OOXML and ODF parsers until after we have extracted the metadata
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java?rev=1103546&r1=1103545&r2=1103546&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java Sun May 15 21:17:12 2011
@@ -35,6 +35,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
+import org.apache.tika.sax.EndDocumentShieldingContentHandler;
import org.apache.xmlbeans.XmlException;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -46,7 +47,7 @@ import org.xml.sax.SAXException;
public class OOXMLExtractorFactory {
public static void parse(
- InputStream stream, ContentHandler handler,
+ InputStream stream, ContentHandler baseHandler,
Metadata metadata, ParseContext context)
throws IOException, SAXException, TikaException {
Locale locale = context.get(Locale.class, Locale.getDefault());
@@ -83,9 +84,18 @@ public class OOXMLExtractorFactory {
} else {
extractor = new POIXMLTextExtractorDecorator(context, poiExtractor);
}
-
+
+ // We need to get the content first, but not end
+ // the document just yet
+ EndDocumentShieldingContentHandler handler =
+ new EndDocumentShieldingContentHandler(baseHandler);
extractor.getXHTML(handler, metadata, context);
+
+ // Now we can get the metadata
extractor.getMetadataExtractor().extract(metadata);
+
+ // Then finish up
+ handler.reallyEndDocument();
} catch (IllegalArgumentException e) {
if (e.getMessage().startsWith("No supported documents found")) {
throw new TikaException(
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java?rev=1103546&r1=1103545&r2=1103546&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java Sun May 15 21:17:12 2011
@@ -33,10 +33,13 @@ import org.xml.sax.SAXException;
/**
* Office Open XML (OOXML) parser.
- *
*/
public class OOXMLParser extends AbstractParser {
-
+ /**
+ * Serial version UID
+ */
+ private static final long serialVersionUID = 6535995710857776481L;
+
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
MediaType.application("x-tika-ooxml"),
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java?rev=1103546&r1=1103545&r2=1103546&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java Sun May 15 21:17:12 2011
@@ -32,6 +32,7 @@ import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.EndDocumentShieldingContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -102,9 +103,16 @@ public class OpenDocumentParser extends
}
public void parse(
- InputStream stream, ContentHandler handler,
+ InputStream stream, ContentHandler baseHandler,
Metadata metadata, ParseContext context)
throws IOException, SAXException, TikaException {
+
+ // As we don't know which of the metadata or the content
+ // we'll hit first, catch the endDocument call initially
+ EndDocumentShieldingContentHandler handler =
+ new EndDocumentShieldingContentHandler(baseHandler);
+
+ // Process the file in turn
ZipInputStream zip = new ZipInputStream(stream);
ZipEntry entry = zip.getNextEntry();
while (entry != null) {
@@ -118,6 +126,11 @@ public class OpenDocumentParser extends
}
entry = zip.getNextEntry();
}
+
+ // Only now call the end document
+ if(handler.getEndDocumentWasCalled()) {
+ handler.reallyEndDocument();
+ }
}
}