You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2011/11/28 01:26:38 UTC
svn commit: r1206937 - in /tika/trunk:
tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java
tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Author: nick
Date: Mon Nov 28 00:26:28 2011
New Revision: 1206937
URL: http://svn.apache.org/viewvc?rev=1206937&view=rev
Log:
TIKA-794 Correct Little16 mime magic logic, and enable the CPIO test now that the detection is correct
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java?rev=1206937&r1=1206936&r2=1206937&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java Mon Nov 28 00:26:28 2011
@@ -83,7 +83,7 @@ public class MagicDetector implements De
decoded = tmpVal.getBytes();
} else if (type.equals("host16") || type.equals("little16")) {
int i = Integer.parseInt(tmpVal, radix);
- decoded = new byte[] { (byte) (i >> 8), (byte) (i & 0x00FF) };
+ decoded = new byte[] { (byte) (i & 0x00FF), (byte) (i >> 8) };
} else if (type.equals("big16")) {
int i = Integer.parseInt(tmpVal, radix);
decoded = new byte[] { (byte) (i >> 8), (byte) (i & 0x00FF) };
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1206937&r1=1206936&r2=1206937&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java Mon Nov 28 00:26:28 2011
@@ -207,12 +207,12 @@ public class TestMimeTypes extends TestC
// TODO Add an example .deb and .udeb, then check these
// Check the mime magic patterns for them work too
- assertTypeByData("application/x-archive", "testARofText.ar"); // TODO TIKA-697
- assertTypeByData("application/x-archive", "testARofSND.ar"); // TODO TIKA-697
+ assertTypeByData("application/x-archive", "testARofText.ar");
+ assertTypeByData("application/x-archive", "testARofSND.ar");
assertTypeByData("application/zip", "test-documents.zip");
assertTypeByData("application/x-gtar", "test-documents.tar"); // GNU TAR
assertTypeByData("application/x-gzip", "test-documents.tgz"); // See GZIP, not tar contents of it
-// assertTypeByData("application/x-cpio", "test-documents.cpio"); // TODO Magic isn't correct?
+ assertTypeByData("application/x-cpio", "test-documents.cpio");
}
public void testJpegDetection() throws Exception {