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/02/03 22:40:45 UTC
svn commit: r740463 - in /lucene/tika/trunk/src: main/resources/mime/
test/java/org/apache/tika/mime/ test/resources/test-documents/
Author: jukka
Date: Tue Feb 3 21:40:42 2009
New Revision: 740463
URL: http://svn.apache.org/viewvc?rev=740463&view=rev
Log:
TIKA-192: Add glob and magic patterns for image types
Improved PNM type information, plus relevant tests.
Added:
lucene/tika/trunk/src/test/resources/test-documents/testPBM.pbm
lucene/tika/trunk/src/test/resources/test-documents/testPGM.pgm
lucene/tika/trunk/src/test/resources/test-documents/testPPM.ppm
Modified:
lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml
lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified: lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml?rev=740463&r1=740462&r2=740463&view=diff
==============================================================================
--- lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml (original)
+++ lucene/tika/trunk/src/main/resources/mime/tika-mimetypes.xml Tue Feb 3 21:40:42 2009
@@ -1039,21 +1039,38 @@
<glob pattern="*.dib" />
</mime-type>
+ <mime-type type="image/x-portable-anymap">
+ <acronym>PNM</acronym>
+ <comment>Portable Any Map</comment>
+ <glob pattern="*.pnm" />
+ </mime-type>
+
<mime-type type="image/x-portable-bitmap">
+ <sub-class-of type="image/x-portable-anymap" />
+ <acronym>PBM</acronym>
+ <comment>Portable Bit Map</comment>
<magic priority="50">
<match value="P1" type="string" offset="0" />
<match value="P4" type="string" offset="0" />
</magic>
<glob pattern="*.pbm" />
</mime-type>
- <mime-type type="image/x-portable-greymap">
+
+ <mime-type type="image/x-portable-graymap">
+ <sub-class-of type="image/x-portable-anymap" />
+ <acronym>PGM</acronym>
+ <comment>Portable Gray Map</comment>
<magic priority="50">
<match value="P2" type="string" offset="0" />
<match value="P5" type="string" offset="0" />
</magic>
<glob pattern="*.pgm" />
</mime-type>
+
<mime-type type="image/x-portable-pixmap">
+ <sub-class-of type="image/x-portable-anymap" />
+ <acronym>PXM</acronym>
+ <comment>Portable Pixel Map</comment>
<magic priority="50">
<match value="P3" type="string" offset="0" />
<match value="P6" type="string" offset="0" />
@@ -1061,6 +1078,7 @@
</magic>
<glob pattern="*.ppm" />
</mime-type>
+
<mime-type type="message/news">
<magic priority="50">
<match value="Path:" type="string" offset="0" />
Modified: lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=740463&r1=740462&r2=740463&view=diff
==============================================================================
--- lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java (original)
+++ lucene/tika/trunk/src/test/java/org/apache/tika/mime/TestMimeTypes.java Tue Feb 3 21:40:42 2009
@@ -136,6 +136,23 @@
assertTypeByName("image/x-ms-bmp", "x.DIB");
}
+ public void testPnmDetection() throws Exception {
+ assertType("image/x-portable-bitmap", "testPBM.pbm");
+ assertType("image/x-portable-graymap", "testPGM.pgm");
+ assertType("image/x-portable-pixmap", "testPPM.ppm");
+ assertTypeByData("image/x-portable-bitmap", "testPBM.pbm");
+ assertTypeByData("image/x-portable-graymap", "testPGM.pgm");
+ assertTypeByData("image/x-portable-pixmap", "testPPM.ppm");
+ assertTypeByName("image/x-portable-anymap", "x.pnm");
+ assertTypeByName("image/x-portable-anymap", "x.PNM");
+ assertTypeByName("image/x-portable-bitmap", "x.pbm");
+ assertTypeByName("image/x-portable-bitmap", "x.PBM");
+ assertTypeByName("image/x-portable-graymap", "x.pgm");
+ assertTypeByName("image/x-portable-graymap", "x.PGM");
+ assertTypeByName("image/x-portable-pixmap", "x.ppm");
+ assertTypeByName("image/x-portable-pixmap", "x.PPM");
+ }
+
/**
* Tests MimeTypes.getMimeType(URL), which examines both the byte header
* and, if necessary, the URL's extension.
Added: lucene/tika/trunk/src/test/resources/test-documents/testPBM.pbm
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/src/test/resources/test-documents/testPBM.pbm?rev=740463&view=auto
==============================================================================
--- lucene/tika/trunk/src/test/resources/test-documents/testPBM.pbm (added)
+++ lucene/tika/trunk/src/test/resources/test-documents/testPBM.pbm Tue Feb 3 21:40:42 2009
@@ -0,0 +1,3 @@
+P1
+1 1
+0
\ No newline at end of file
Added: lucene/tika/trunk/src/test/resources/test-documents/testPGM.pgm
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/src/test/resources/test-documents/testPGM.pgm?rev=740463&view=auto
==============================================================================
--- lucene/tika/trunk/src/test/resources/test-documents/testPGM.pgm (added)
+++ lucene/tika/trunk/src/test/resources/test-documents/testPGM.pgm Tue Feb 3 21:40:42 2009
@@ -0,0 +1,4 @@
+P2
+1 1
+255
+0
\ No newline at end of file
Added: lucene/tika/trunk/src/test/resources/test-documents/testPPM.ppm
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/src/test/resources/test-documents/testPPM.ppm?rev=740463&view=auto
==============================================================================
--- lucene/tika/trunk/src/test/resources/test-documents/testPPM.ppm (added)
+++ lucene/tika/trunk/src/test/resources/test-documents/testPPM.ppm Tue Feb 3 21:40:42 2009
@@ -0,0 +1,4 @@
+P3
+1 1
+255
+0 0 0
\ No newline at end of file