You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2012/05/28 06:18:21 UTC
svn commit: r1343137 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/pkg/PackageExtractor.java
test/java/org/apache/tika/parser/pkg/ArParserTest.java
Author: mattmann
Date: Mon May 28 04:18:21 2012
New Revision: 1343137
URL: http://svn.apache.org/viewvc?rev=1343137&view=rev
Log:
- fix for TIKA-935 TikaException thrown when trying to parse archive (*.ar) files contributed by Josh Mastarone
Added:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java?rev=1343137&r1=1343136&r2=1343137&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java Mon May 28 04:18:21 2012
@@ -101,7 +101,7 @@ class PackageExtractor {
|| (a == 0xc7 && b == 0x71)) {
metadata.set(Metadata.CONTENT_TYPE, "application/x-cpio");
unpack(new CpioArchiveInputStream(stream), xhtml);
- } else if (a == '=' && (b == '<' || b == '!')) {
+ } else if ((a == '=' || a == '!') && (b == '<')) {
metadata.set(Metadata.CONTENT_TYPE, "application/x-archive");
unpack(new ArArchiveInputStream(stream), xhtml);
} else {
Added: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java?rev=1343137&view=auto
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java (added)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java Mon May 28 04:18:21 2012
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tika.parser.pkg;
+
+import java.io.InputStream;
+
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.xml.sax.ContentHandler;
+
+public class ArParserTest extends AbstractPkgTest {
+ public void testArParsing() throws Exception {
+ Parser parser = new AutoDetectParser();
+
+ ContentHandler handler = new BodyContentHandler();
+ Metadata metadata = new Metadata();
+
+ InputStream stream = ArParserTest.class
+ .getResourceAsStream("/test-documents/testAROfText.ar");
+ try {
+ parser.parse(stream, handler, metadata, recursingContext);
+ } finally {
+ stream.close();
+ }
+
+ assertEquals("application/x-archive",
+ metadata.get(Metadata.CONTENT_TYPE));
+ String content = handler.toString();
+ assertTrue(content.contains("testTXT.txt"));
+ assertTrue(content.contains("Test d'indexation de Txt"));
+ assertTrue(content.contains("http://www.apache.org"));
+
+ stream = ArParserTest.class
+ .getResourceAsStream("/test-documents/testAROfSND.ar");
+ try {
+ parser.parse(stream, handler, metadata, recursingContext);
+ } finally {
+ stream.close();
+ }
+
+ assertEquals("application/x-archive",
+ metadata.get(Metadata.CONTENT_TYPE));
+ content = handler.toString();
+ assertTrue(content.contains("testAU.au"));
+ }
+
+ /**
+ * Tests that the ParseContext parser is correctly fired for all the
+ * embedded entries.
+ */
+ public void testEmbedded() throws Exception {
+ Parser parser = new AutoDetectParser(); // Should auto-detect!
+ ContentHandler handler = new BodyContentHandler();
+ Metadata metadata = new Metadata();
+
+ InputStream stream = ArParserTest.class
+ .getResourceAsStream("/test-documents/testAROfText.ar");
+ try {
+ parser.parse(stream, handler, metadata, trackingContext);
+ } finally {
+ stream.close();
+ }
+
+ assertEquals(1, tracker.filenames.size());
+ assertEquals(1, tracker.mediatypes.size());
+
+ assertEquals("testTXT.txt", tracker.filenames.get(0));
+
+ for (String type : tracker.mediatypes) {
+ assertNull(type);
+ }
+
+ tracker.reset();
+ stream = ArParserTest.class
+ .getResourceAsStream("/test-documents/testAROfSND.ar");
+ try {
+ parser.parse(stream, handler, metadata, trackingContext);
+ } finally {
+ stream.close();
+ }
+
+ assertEquals(1, tracker.filenames.size());
+ assertEquals(1, tracker.mediatypes.size());
+ assertEquals("testAU.au", tracker.filenames.get(0));
+
+ for (String type : tracker.mediatypes) {
+ assertNull(type);
+ }
+ }
+}
Re: svn commit: r1343137 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/pkg/PackageExtractor.java
test/java/org/apache/tika/parser/pkg/ArParserTest.java
Posted by "Mattmann, Chris A (388J)" <ch...@jpl.nasa.gov>.
s/Josh/John/
Sorry John!
Cheers,
Chris
On May 27, 2012, at 9:18 PM, <ma...@apache.org>
<ma...@apache.org> wrote:
> Author: mattmann
> Date: Mon May 28 04:18:21 2012
> New Revision: 1343137
>
> URL: http://svn.apache.org/viewvc?rev=1343137&view=rev
> Log:
> - fix for TIKA-935 TikaException thrown when trying to parse archive (*.ar) files contributed by Josh Mastarone
>
> Added:
> tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
> Modified:
> tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java
>
> Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java
> URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageExtractor.java?rev=1343137&r1=1343136&r2=1343137&view=diff
[...snip...]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Chris Mattmann, Ph.D.
Senior Computer Scientist
NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
Office: 171-266B, Mailstop: 171-246
Email: chris.a.mattmann@nasa.gov
WWW: http://sunset.usc.edu/~mattmann/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adjunct Assistant Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++