You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2018/07/09 17:23:10 UTC
[tika] 01/04: Merge branch 'TIKA-2468' of
https://github.com/bitsgalore/tika
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 43b84c24fa26520ab0a4edcef1accbf49f23b101
Merge: dae1d5b 8c7c760
Author: Chris Mattmann <ch...@jpl.nasa.gov>
AuthorDate: Fri May 25 18:31:11 2018 -0700
Merge branch 'TIKA-2468' of https://github.com/bitsgalore/tika
NOTICE.txt | 4 +
.../org/apache/tika/mime/tika-mimetypes.xml | 128 +++++++++++++++++++--
.../test-documents/testLotus123-lotusftp.123 | Bin 0 -> 18768 bytes
.../test-documents/testLotus123-lotusftp.wk4 | Bin 0 -> 6168 bytes
.../test/resources/test-documents/testLotus123.wk1 | Bin 0 -> 24291 bytes
.../test/resources/test-documents/testLotus123.wk3 | Bin 0 -> 18635 bytes
.../test/resources/test-documents/testLotus123.wks | Bin 0 -> 852 bytes
.../test/resources/test-documents/testQuattro.wb1 | Bin 0 -> 4813 bytes
.../test/resources/test-documents/testQuattro.wb2 | Bin 0 -> 4804 bytes
.../test/resources/test-documents/testQuattro.wq1 | Bin 0 -> 18687 bytes
.../test/resources/test-documents/testQuattro.wq2 | Bin 0 -> 7938 bytes
.../test-documents/testWordPerfect_42.doc | Bin 0 -> 725 bytes
12 files changed, 125 insertions(+), 7 deletions(-)
diff --cc tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 104cd2c,ef54e99..e12dd02
--- 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
@@@ -2838,38 -2843,7 +2906,31 @@@
<mime-type type="application/wspolicy+xml">
<glob pattern="*.wspolicy"/>
</mime-type>
+
+ <mime-type type="image/x-tga">
+ <alias type="image/x-targa"/>
+ <!-- trailer bytes: 54 52 55 45 56 49 53 49 4F 4E 2D 58 46 49 4C 45 2E 00
+ trailer as string: TRUEVISION-XFILE\\x2E\\x00
+ Some .tga files may be conflicting with application/x-123 recognition,
+ therefore this mime-type must be set in front of application/x-123 -->
+ <_comment>Targa image data</_comment>
+ <magic priority="90">
+ <match value="0x01010000" type="big32" offset="1" >
+ <match value=".*[\\x54\\x52\\x55\\x45\\x56\\x49\\x53\\x49\\x4F\\x4E\\x2D\\x58\\x46\\x49\\x4C\\x45\\x2E\\x00]" type="regex" offset="8" />
+ </match>
+ <match value="0x00020000" type="big32" offset="1" >
+ <match value=".*[\\x54\\x52\\x55\\x45\\x56\\x49\\x53\\x49\\x4F\\x4E\\x2D\\x58\\x46\\x49\\x4C\\x45\\x2E\\x00]" type="regex" offset="8" />
+ </match>
+ <match value="0x00030000" type="big32" offset="1" >
+ <match value=".*[\\x54\\x52\\x55\\x45\\x56\\x49\\x53\\x49\\x4F\\x4E\\x2D\\x58\\x46\\x49\\x4C\\x45\\x2E\\x00]" type="regex" offset="8" />
+ </match>
+ </magic>
+ <glob pattern="*.tga"/>
+ <glob pattern="*.icb"/>
+ <glob pattern="*.vda"/>
+ <!-- <glob pattern="*.vst"/> --> <!-- conflicting with application/vnd.visio-->
+ </mime-type>
- <mime-type type="application/x-123">
- <magic priority="50">
- <match value="0x00001a00" type="big32" offset="0" />
- <match value="0x00000200" type="big32" offset="0" />
- </magic>
- </mime-type>
-
<mime-type type="application/x-abiword">
<glob pattern="*.abw"/>
</mime-type>