Return-Path: X-Original-To: apmail-tika-commits-archive@www.apache.org Delivered-To: apmail-tika-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1D7094F5 for ; Tue, 20 Dec 2011 06:22:35 +0000 (UTC) Received: (qmail 6054 invoked by uid 500); 20 Dec 2011 06:22:35 -0000 Delivered-To: apmail-tika-commits-archive@tika.apache.org Received: (qmail 6012 invoked by uid 500); 20 Dec 2011 06:22:33 -0000 Mailing-List: contact commits-help@tika.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tika.apache.org Delivered-To: mailing list commits@tika.apache.org Received: (qmail 6001 invoked by uid 99); 20 Dec 2011 06:22:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 06:22:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 06:22:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6A7072388A3F; Tue, 20 Dec 2011 06:22:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1221115 - /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java Date: Tue, 20 Dec 2011 06:22:11 -0000 To: commits@tika.apache.org From: nick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111220062211.6A7072388A3F@eris.apache.org> Author: nick Date: Tue Dec 20 06:22:10 2011 New Revision: 1221115 URL: http://svn.apache.org/viewvc?rev=1221115&view=rev Log: TIKA-705 / TIKA-757 - Simplify the OOXML related parts code, following POI upgrade Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java?rev=1221115&r1=1221114&r2=1221115&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java Tue Dec 20 06:22:10 2011 @@ -18,8 +18,6 @@ package org.apache.tika.parser.microsoft import java.io.FileNotFoundException; import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; import java.util.List; import org.apache.poi.POIXMLDocument; @@ -27,7 +25,6 @@ import org.apache.poi.POIXMLTextExtracto import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackageRelationship; -import org.apache.poi.openxml4j.opc.PackagingURIHelper; import org.apache.poi.openxml4j.opc.TargetMode; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.Ole10Native; @@ -121,21 +118,7 @@ public abstract class AbstractOOXMLExtra for (PackagePart source : getMainDocumentParts()) { for (PackageRelationship rel : source.getRelationships()) { if (rel.getTargetMode() == TargetMode.INTERNAL) { - // TODO Simply this when on POI 3.8 beta 5 - URI uri = rel.getTargetURI(); - if(uri.getFragment() != null) { - // TODO Workaround for TIKA-705 needed until 3.8 beta 5 - try { - String u = uri.toString(); - uri = new URI(u.substring(0, u.indexOf('#'))); - } catch(URISyntaxException e) { - throw new TikaException("Broken OOXML file", e); - } - } - PackagePart target = rel.getPackage().getPart( - PackagingURIHelper.createPartName(uri)); - // TODO Simpler version in POI 3.8 beta 5 - // PackagePart target = source.getRelatedPart(rel); + PackagePart target = source.getRelatedPart(rel); String type = rel.getRelationshipType(); if (RELATION_OLE_OBJECT.equals(type)