Repository: tika Updated Branches: refs/heads/master 9a1ba9494 -> 355a7d13e
Patch from prasadns14 from TIKA-1875: NetCDF mime magic, and detection unit test. This closes #78 from github Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/355a7d13 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/355a7d13 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/355a7d13 Branch: refs/heads/master Commit: 355a7d13e96608033c9f349048bacf6dbda73aaf Parents: 9a1ba94 Author: Nick Burch <[email protected]> Authored: Sun Mar 6 12:18:55 2016 +0000 Committer: Nick Burch <[email protected]> Committed: Sun Mar 6 12:18:55 2016 +0000 ---------------------------------------------------------------------- .../src/main/resources/org/apache/tika/mime/tika-mimetypes.xml | 4 ++++ .../src/test/java/org/apache/tika/mime/TestMimeTypes.java | 5 +++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/355a7d13/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml ---------------------------------------------------------------------- diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml index 95f41e6..1ec9998 100644 --- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml +++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml @@ -3590,6 +3590,10 @@ <mime-type type="application/x-netcdf"> <glob pattern="*.nc"/> <glob pattern="*.cdf"/> + <magic priority="50"> + <match value="CDF\001" type="string" offset="0" /> + <match value="CDF\002" type="string" offset="0" /> + </magic> </mime-type> <mime-type type="application/x-pkcs12"> <glob pattern="*.p12"/> http://git-wip-us.apache.org/repos/asf/tika/blob/355a7d13/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java index 92f7b88..d83f18b 100644 --- a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java +++ b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java @@ -69,6 +69,11 @@ public class TestMimeTypes { } @Test + public void testNetCDF() throws Exception { + assertTypeByData("application/x-netcdf", "sresa1b_ncar_ccsm3_0_run1_200001.nc"); + } + + @Test public void testLoadMimeTypes() throws MimeTypeException { assertNotNull(repo.forName("application/octet-stream")); assertNotNull(repo.forName("text/x-tex"));
