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/05/10 16:26:17 UTC
svn commit: r1101471 - in /tika/trunk:
tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Author: nick
Date: Tue May 10 14:26:17 2011
New Revision: 1101471
URL: http://svn.apache.org/viewvc?rev=1101471&view=rev
Log:
TIKA-658 TCPDump pcap mime matching
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1101471&r1=1101470&r2=1101471&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original)
+++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Tue May 10 14:26:17 2011
@@ -1929,6 +1929,18 @@
<mime-type type="application/vnd.tao.intent-module-archive">
<glob pattern="*.tao"/>
</mime-type>
+
+ <mime-type type="application/vnd.tcpdump.pcap">
+ <_comment>TCPDump pcap packet capture</_comment>
+ <magic priority="50">
+ <match value="0xa1b2c3d4" type="big32" offset="0" />
+ <match value="0xd4c3b2a1" type="big32" offset="0" />
+ </magic>
+ <glob pattern="*.pcap"/>
+ <glob pattern="*.cap"/>
+ <glob pattern="*.dmp"/>
+ </mime-type>
+
<mime-type type="application/vnd.tmobile-livetv">
<glob pattern="*.tmo"/>
</mime-type>
@@ -3478,7 +3490,6 @@
<mime-type type="image/x-raw-phaseone">
<_comment>Phase One raw image</_comment>
- <glob pattern="*.cap"/>
<glob pattern="*.iiq"/>
</mime-type>
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=1101471&r1=1101470&r2=1101471&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 Tue May 10 14:26:17 2011
@@ -392,9 +392,7 @@ public class TestMimeTypes extends TestC
assertTypeByName("image/x-raw-leaf", "x.mos");
assertTypeByName("image/x-raw-panasonic", "x.raw");
assertTypeByName("image/x-raw-panasonic", "x.rw2");
- assertTypeByName("image/x-raw-phaseone", "x.cap");
assertTypeByName("image/x-raw-phaseone", "x.iiq");
- assertTypeByName("image/x-raw-phaseone", "x.cap");
assertTypeByName("image/x-raw-red", "x.r3d");
assertTypeByName("image/x-raw-imacon", "x.fff");
assertTypeByName("image/x-raw-logitech", "x.pxn");