svn commit: r1658018 - in /tika/trunk: tika-core/src/main/resources/org/apache/tika/mime/ tika-core/src/test/java/org/apache/tika/ tika-parsers/src/test/resources/test-documents/

[mattmann]

Author: mattmann
Date: Sat Feb  7 02:00:38 2015
New Revision: 1658018

URL: http://svn.apache.org/r1658018
Log:
Fix for TIKA-1539 GRB file magic bytes and extension matching contributed by 
Luke Sh LukeLiush <hanson311...@gmail.com>.

Added:
    
tika/trunk/tika-parsers/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb
   (with props)
    
tika/trunk/tika-parsers/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2
   (with props)
Modified:
    
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
    tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
    
tika/trunk/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.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=1658018&r1=1658017&r2=1658018&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 
Sat Feb  7 02:00:38 2015
@@ -6197,5 +6197,17 @@
     <glob pattern="*.xquery"/>
     <sub-class-of type="text/plain"/>
   </mime-type>
-
+  
+  <mime-type type="application/x-grib">
+       <acronym>GRIB</acronym>
+       <_comment>General Regularly-distributed Information in Binary 
form</_comment>
+       <tika:link>http://en.wikipedia.org/wiki/GRIB</tika:link>
+       <magic priority="50">
+       <match value="GRIB" type="string" offset="0"/>
+       </magic>
+       <glob pattern="*.grb"/>
+       <glob pattern="*.grb1"/>
+       <glob pattern="*.grb2"/>
+  </mime-type>
+  
 </mime-info>

Modified: 
tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java?rev=1658018&r1=1658017&r2=1658018&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java 
(original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java 
Sat Feb  7 02:00:38 2015
@@ -841,6 +841,11 @@ public class TikaDetectionTest {
         assertEquals("video/x-msvideo", tika.detect("x.avi"));
         assertEquals("video/x-sgi-movie", tika.detect("x.movie"));
         assertEquals("x-conference/x-cooltalk", tika.detect("x.ice"));
+
+        assertEquals("application/x-grib", tika.detect("x.grb"));
+        assertEquals("application/x-grib", tika.detect("x.grb1"));
+        assertEquals("application/x-grib", tika.detect("x.grb2"));
+        
     }
 
 }

Modified: 
tika/trunk/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java?rev=1658018&r1=1658017&r2=1658018&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java 
(original)
+++ 
tika/trunk/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java 
Sat Feb  7 02:00:38 2015
@@ -36,7 +36,7 @@ public class TypeDetectionBenchmark {
             }
         } else {
             benchmark(new File(
-                    "../tika-parsers/src/test/resources/test-documents"));
+                    "../tika-parsers/src/test/resources/test-documents")); 
         }
         System.out.println(
                 "Total benchmark time: "

Added: 
tika/trunk/tika-parsers/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb?rev=1658018&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
tika/trunk/tika-parsers/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
tika/trunk/tika-parsers/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2?rev=1658018&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
tika/trunk/tika-parsers/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream