svn commit: r949776 - /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java

[ju...@apache.org]

Author: jukka
Date: Mon May 31 15:57:35 2010
New Revision: 949776

URL: http://svn.apache.org/viewvc?rev=949776&view=rev
Log:
TIKA-402: Support for Keynote and Pages documents

Use the ZIP support from commons-compress instead of the less complete java.util.zip

Modified:
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java?rev=949776&r1=949775&r2=949776&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java Mon May 31 15:57:35 2010
@@ -16,6 +16,9 @@
  */
 package org.apache.tika.parser.iwork;
 
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.ArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.CloseShieldInputStream;
 import org.apache.tika.metadata.Metadata;
@@ -33,8 +36,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 /**
  * A parser for the IWork formats.
@@ -66,9 +67,9 @@ public class IWorkParser implements Pars
         XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
         xhtml.startDocument();
 
-        ZipInputStream zip =
-            new ZipInputStream(new CloseShieldInputStream(stream));
-        ZipEntry entry = zip.getNextEntry();
+        ArchiveInputStream zip =
+            new ZipArchiveInputStream(new CloseShieldInputStream(stream));
+        ArchiveEntry entry = zip.getNextEntry();
         while (entry != null) {
             if ("index.apxl".equals(entry.getName())) {
                 metadata.set(