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/05/20 22:34:37 UTC
svn commit: r776842 - in /lucene/tika/trunk:
tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java
tika-core/src/main/java/org/apache/tika/utils/Utils.java
tika-parsers/src/test/java/org/apache/tika/TestParsers.java
Author: jukka
Date: Wed May 20 20:34:37 2009
New Revision: 776842
URL: http://svn.apache.org/viewvc?rev=776842&view=rev
Log:
TIKA-220: Remove obsolete utility code
Removed:
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/Utils.java
Modified:
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java
Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java?rev=776842&r1=776841&r2=776842&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java Wed May 20 20:34:37 2009
@@ -20,12 +20,9 @@
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.exception.TikaException;
@@ -98,69 +95,6 @@
}
/**
- * Returns a list of parsers from zip InputStream
- *
- * @param zip
- * InputStream
- * @param config
- * @return a list of parsers from zip file
- * @throws TikaException
- */
- private static List<Parser> getParsersFromZip(InputStream zipIs,
- TikaConfig config) throws TikaException {
- try {
- List<Parser> parsers = new ArrayList<Parser>();
- List<File> zipFiles = Utils.unzip(zipIs);
- for (int i = 0; i < zipFiles.size(); i++) {
- File zipEntry = zipFiles.get(i);
- parsers.add(getParser(zipEntry, config));
- }
- return parsers;
- } catch (IOException e) {
- throw new TikaException("Failed to read zip file", e);
- }
- }
-
- /**
- * Returns a list of parsers from zip File
- *
- * @param zip
- * File
- * @param config
- * @return a list of parsers from zip file
- * @throws TikaException
- * @throws FileNotFoundException
- */
- public static List<Parser> getParsersFromZip(File zip, TikaConfig config)
- throws TikaException, FileNotFoundException {
- String zipMimeType = config.getMimeRepository().getMimeType(zip)
- .getName();
- if (!zipMimeType.equalsIgnoreCase("application/zip")) {
- throw new TikaException("The file you are using is note a zip file");
- }
- return getParsersFromZip(new FileInputStream(zip), config);
- }
-
- /**
- * Returns a list of parsers from URL
- *
- * @param zip
- * @param config
- * @return a list of parsers from zip file
- * @throws TikaException
- * @throws IOException
- */
- public static List<Parser> getParsersFromZip(URL zip, TikaConfig config)
- throws TikaException, IOException {
- String zipMimeType = config.getMimeRepository().getMimeType(zip)
- .getName();
- if (!zipMimeType.equalsIgnoreCase("application/zip")) {
- throw new TikaException("The file you are using is note a zip file");
- }
- return getParsersFromZip(zip.openStream(), config);
- }
-
- /**
* Gets the string content of a document read from an input stream.
*
* @param stream the stream from which to read document data
Modified: lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java?rev=776842&r1=776841&r2=776842&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java (original)
+++ lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java Wed May 20 20:34:37 2009
@@ -19,7 +19,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import java.util.List;
import junit.framework.TestCase;
@@ -27,7 +26,6 @@
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.Parser;
import org.apache.tika.utils.ParseUtils;
-import org.apache.tika.utils.Utils;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -191,31 +189,6 @@
assertNotNull(parser);
}
- public void testZipExtraction() throws Exception {
- File zip = getTestFile("test-documents.zip");
- List<Parser> parsers = ParseUtils.getParsersFromZip(zip, tc);
- List<File> zipFiles = Utils.unzip(new FileInputStream(zip));
- for (int i = 0; i < parsers.size(); i++) {
- Parser zipEntryParser = parsers.get(i);
- assertNotNull(zipEntryParser);
- for (int j = 0; j < zipFiles.size(); j++) {
- /* FIXME: Doesn't work with the new Parser interface
- ParserConfig config = tc.getParserConfig(
- zipEntryParser.getMimeType());
- Map<String, Content> contents = config.getContents();
- assertNotNull(contents);
- InputStream stream = new FileInputStream(zipFiles.get(j));
- try {
- zipEntryParser.getContents(stream, contents);
- assertNotNull(contents.get("fullText"));
- } finally {
- stream.close();
- }
- */
- }
- }
- }
-
private File getTestFile(String filename) {
return new File(testFilesBaseDir, filename);
}