svn commit: r819881 - in /lucene/tika/trunk/tika-parsers: pom.xml src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java

[jukka]

Author: jukka
Date: Tue Sep 29 10:51:01 2009
New Revision: 819881

URL: http://svn.apache.org/viewvc?rev=819881&view=rev
Log:
TIKA-284: Upgrade to POI 3.5-FINAL

Modified:
    lucene/tika/trunk/tika-parsers/pom.xml
    
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java

Modified: lucene/tika/trunk/tika-parsers/pom.xml
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/pom.xml?rev=819881&r1=819880&r2=819881&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/pom.xml (original)
+++ lucene/tika/trunk/tika-parsers/pom.xml Tue Sep 29 10:51:01 2009
@@ -38,7 +38,7 @@
   <url>http://lucene.apache.org/tika/</url>
 
   <properties>
-    <poi.version>3.5-beta6</poi.version>
+    <poi.version>3.5-FINAL</poi.version>
   </properties>
 
   <dependencies>

Modified: 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java?rev=819881&r1=819880&r2=819881&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
 (original)
+++ 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
 Tue Sep 29 10:51:01 2009
@@ -16,17 +16,13 @@
  */
 package org.apache.tika.parser.microsoft.ooxml;
 
-import java.io.IOException;
-
 import org.apache.poi.POIXMLTextExtractor;
 import org.apache.poi.POIXMLProperties.CoreProperties;
 import org.apache.poi.POIXMLProperties.ExtendedProperties;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
 import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
 import org.apache.poi.openxml4j.util.Nullable;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
-import org.apache.xmlbeans.XmlException;
 import 
org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties;
 
 /**
@@ -48,17 +44,9 @@
     }
 
     public void extract(Metadata metadata) throws TikaException {
-        try {
-            addProperty(metadata, Metadata.CONTENT_TYPE, type);
-            extractMetadata(extractor.getCoreProperties(), metadata);
-            extractMetadata(extractor.getExtendedProperties(), metadata);
-        } catch (IOException e) {
-            throw new TikaException("Error extracting OOXML metadata", e);
-        } catch (OpenXML4JException e) {
-            throw new TikaException("Error extracting OOXML metadata", e);
-        } catch (XmlException e) {
-            throw new TikaException("Error extracting OOXML metadata", e);
-        }
+        addProperty(metadata, Metadata.CONTENT_TYPE, type);
+        extractMetadata(extractor.getCoreProperties(), metadata);
+        extractMetadata(extractor.getExtendedProperties(), metadata);
     }
 
     private void extractMetadata(CoreProperties properties, Metadata metadata) 
{