You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2009/04/07 01:22:40 UTC

svn commit: r762562 - /lucene/tika/branches/TIKA-204/src/main/java/org/apache/tika/parser/pkg/GzipParser.java

Author: jukka
Date: Mon Apr  6 23:22:40 2009
New Revision: 762562

URL: http://svn.apache.org/viewvc?rev=762562&view=rev
Log:
TIKA-204: Use commons-compress for parsing packages

Use the new GzipUtils code introduced in COMPRESS-68.

Modified:
    lucene/tika/branches/TIKA-204/src/main/java/org/apache/tika/parser/pkg/GzipParser.java

Modified: lucene/tika/branches/TIKA-204/src/main/java/org/apache/tika/parser/pkg/GzipParser.java
URL: http://svn.apache.org/viewvc/lucene/tika/branches/TIKA-204/src/main/java/org/apache/tika/parser/pkg/GzipParser.java?rev=762562&r1=762561&r2=762562&view=diff
==============================================================================
--- lucene/tika/branches/TIKA-204/src/main/java/org/apache/tika/parser/pkg/GzipParser.java (original)
+++ lucene/tika/branches/TIKA-204/src/main/java/org/apache/tika/parser/pkg/GzipParser.java Mon Apr  6 23:22:40 2009
@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
 
+import org.apache.commons.compress.compressors.gzip.GzipUtils;
 import org.apache.commons.io.input.CloseShieldInputStream;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
@@ -51,18 +52,9 @@
             Metadata entrydata = new Metadata();
             String name = metadata.get(Metadata.RESOURCE_NAME_KEY);
             if (name != null) {
-                if (name.endsWith(".tgz")) {
-                    name = name.substring(0, name.length() - 4) + ".tar";
-                } else if (name.endsWith(".gz") || name.endsWith("-gz")) {
-                    name = name.substring(0, name.length() - 3);
-                } else if (name.toLowerCase().endsWith(".svgz")) {
-                    name = name.substring(0, name.length() - 1);
-                } else if (name.toLowerCase().endsWith(".wmz")) {
-                    name = name.substring(0, name.length() - 1) + "f";
-                } else if (name.toLowerCase().endsWith(".emz")) {
-                    name = name.substring(0, name.length() - 1) + "f";
-                }
-                entrydata.set(Metadata.RESOURCE_NAME_KEY, name);
+                entrydata.set(
+                        Metadata.RESOURCE_NAME_KEY,
+                        GzipUtils.getUncompressedFilename(name));
             }
             parseEntry(gzip, xhtml, entrydata);
         } finally {