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 2016/03/24 00:31:53 UTC
[1/2] tika git commit: Test vnd.mif file from Steffen Netz from
TIKA-1898
Repository: tika
Updated Branches:
refs/heads/master 9ebf066dd -> c94236a83
Test vnd.mif file from Steffen Netz from TIKA-1898
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/959c9ad2
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/959c9ad2
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/959c9ad2
Branch: refs/heads/master
Commit: 959c9ad2843ed8d21cb3e8c60e5ac614e2f7ab99
Parents: 9ebf066
Author: Nick Burch <ni...@gagravarr.org>
Authored: Wed Mar 23 23:23:15 2016 +0000
Committer: Nick Burch <ni...@gagravarr.org>
Committed: Wed Mar 23 23:23:15 2016 +0000
----------------------------------------------------------------------
.../src/test/resources/test-documents/testMIF.mif | Bin 0 -> 10240 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/959c9ad2/tika-parsers/src/test/resources/test-documents/testMIF.mif
----------------------------------------------------------------------
diff --git a/tika-parsers/src/test/resources/test-documents/testMIF.mif b/tika-parsers/src/test/resources/test-documents/testMIF.mif
new file mode 100644
index 0000000..1035d8a
Binary files /dev/null and b/tika-parsers/src/test/resources/test-documents/testMIF.mif differ
[2/2] tika git commit: Remove erroneous backslashes before
already-escaped < entries in vnd.mif mime magic,
plus unit tests. Thanks to Steffen Netz in TIKA-1898 for help with this
Posted by ni...@apache.org.
Remove erroneous backslashes before already-escaped < entries in vnd.mif mime magic, plus unit tests. Thanks to Steffen Netz in TIKA-1898 for help with this
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/c94236a8
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/c94236a8
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/c94236a8
Branch: refs/heads/master
Commit: c94236a8365b9ab1491d98c31819a85b065a9fe1
Parents: 959c9ad
Author: Nick Burch <ni...@gagravarr.org>
Authored: Wed Mar 23 23:31:12 2016 +0000
Committer: Nick Burch <ni...@gagravarr.org>
Committed: Wed Mar 23 23:31:12 2016 +0000
----------------------------------------------------------------------
.../org/apache/tika/mime/tika-mimetypes.xml | 15 +++++++--------
.../java/org/apache/tika/mime/TestMimeTypes.java | 6 ++++++
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/c94236a8/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 ac3b634..979e0ac 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
@@ -1449,14 +1449,13 @@
<alias type="application/x-mif"/>
<alias type="application/x-frame"/>
<magic priority="50">
- <match value="\<MakerFile" type="string" offset="0" />
- <match value="\<MIFFile" type="string" offset="0" />
- <match value="\<MakerDictionary" type="string" offset="0" />
- <match value="\<MakerScreenFont" type="string" offset="0" />
- <match value="\<MML" type="string" offset="0" />
- <match value="\<Book" type="string" offset="0" />
- <match value="\<Maker" type="string" offset="0" />
- <match value="\x3c\x4d\x49\x46\x46\x69\x6c\x65\x20" type="string" offset="0" />
+ <match value="<MakerFile" type="string" offset="0" />
+ <match value="<MIFFile" type="string" offset="0" />
+ <match value="<MakerDictionary" type="string" offset="0" />
+ <match value="<MakerScreenFont" type="string" offset="0" />
+ <match value="<MML" type="string" offset="0" />
+ <match value="<Book" type="string" offset="0" />
+ <match value="<Maker" type="string" offset="0" />
</magic>
<glob pattern="*.mif"/>
</mime-type>
http://git-wip-us.apache.org/repos/asf/tika/blob/c94236a8/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 57198ad..ce597fa 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
@@ -1001,6 +1001,12 @@ public class TestMimeTypes {
}
@Test
+ public void testMIF() throws Exception {
+ assertType("application/vnd.mif", "testMIF.mif");
+ assertTypeByData("application/vnd.mif", "testMIF.mif");
+ }
+
+ @Test
public void testPKCSSignatures() throws Exception {
// PKCS7 Signed XML files
assertType("application/pkcs7-signature", "testPKCS17Sig.xml.p7m");