[tika] branch master updated: TIKA-2388 OpenOffice database files have application/vnd.oasis.opendocument.base as their embedded mimetype, so make that the canonical one

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new 916e5ed  TIKA-2388 OpenOffice database files have application/vnd.oasis.opendocument.base as their embedded mimetype, so make that the canonical one
916e5ed is described below

commit 916e5eda42bb2d56fec45d2a43647514bd254296
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Thu Jun 8 12:42:48 2017 +0100

    TIKA-2388 OpenOffice database files have application/vnd.oasis.opendocument.base as their embedded mimetype, so make that the canonical one
---
 tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml | 3 ++-
 tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 1d1bc31..f278dd6 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
@@ -1956,7 +1956,8 @@
     <glob pattern="*.otc"/>
   </mime-type>
 
-  <mime-type type="application/vnd.oasis.opendocument.database">
+  <mime-type type="application/vnd.oasis.opendocument.base">
+    <alias type="application/vnd.oasis.opendocument.database"/>
     <glob pattern="*.odb"/>
   </mime-type>
 
diff --git a/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java b/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
index cf242cf..6e0a3bb 100644
--- a/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
+++ b/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
@@ -383,7 +383,8 @@ public class TikaDetectionTest {
         assertEquals("application/vnd.novadigm.ext", tika.detect("x.ext"));
         assertEquals("application/vnd.oasis.opendocument.chart", tika.detect("x.odc"));
         assertEquals("application/vnd.oasis.opendocument.chart-template", tika.detect("x.otc"));
-        assertEquals("application/vnd.oasis.opendocument.database", tika.detect("x.odb"));
+        // Differ from httpd - Mimetype embedded in file is .base not .database
+        //assertEquals("application/vnd.oasis.opendocument.database", tika.detect("x.odb"));
         assertEquals("application/vnd.oasis.opendocument.formula", tika.detect("x.odf"));
         assertEquals("application/vnd.oasis.opendocument.formula-template", tika.detect("x.odft"));
         assertEquals("application/vnd.oasis.opendocument.graphics", tika.detect("x.odg"));

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].