Author: jukka
Date: Fri Oct 16 13:18:45 2009
New Revision: 825880
URL: http://svn.apache.org/viewvc?rev=825880&view=rev
Log:
TIKA-309: Mime type application/rdf+xml not correctly detected
Added:
lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/testRDF.rdf
Modified:
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
Modified:
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=825880&r1=825879&r2=825880&view=diff
==============================================================================
---
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
(original)
+++
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
Fri Oct 16 13:18:45 2009
@@ -355,9 +355,16 @@
<mime-type type="application/prs.nprend"/>
<mime-type type="application/prs.plucker"/>
<mime-type type="application/qsig"/>
+
<mime-type type="application/rdf+xml">
+ <acronym>RDF/XML</acronym>
+ <comment>XML syntax for RDF graphs</comment>
+ <glob pattern="*.owl"/>
<glob pattern="*.rdf"/>
+ <root-XML localName="RDF"
+ namespaceURI="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
</mime-type>
+
<mime-type type="application/reginfo+xml">
<glob pattern="*.rif"/>
</mime-type>
Modified:
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=825880&r1=825879&r2=825880&view=diff
==============================================================================
---
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
(original)
+++
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Fri Oct 16 13:18:45 2009
@@ -191,6 +191,11 @@
assertTypeByName("image/cgm", "x.CGM");
}
+ public void testRdfXmlDetection() throws Exception {
+ assertTypeByName("application/rdf+xml", "x.rdf");
+ assertTypeByName("application/rdf+xml", "x.owl");
+ }
+
public void testSvgDetection() throws Exception {
assertType("image/svg+xml", "testSVG.svg");
assertTypeByData("image/svg+xml", "testSVG.svg");
Modified:
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=825880&r1=825879&r2=825880&view=diff
==============================================================================
---
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
(original)
+++
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
Fri Oct 16 13:18:45 2009
@@ -114,13 +114,13 @@
assertAutoDetect(resource, resource, type, wrongMimeType, content);
assertAutoDetect(resource, null, type, type, content);
-// assertAutoDetect(resource, null, type, null, content);
-// assertAutoDetect(resource, null, type, wrongMimeType, content);
+ assertAutoDetect(resource, null, type, null, content);
+ assertAutoDetect(resource, null, type, wrongMimeType, content);
-// final String badResource = "a.xyz";
-// assertAutoDetect(resource, badResource, type, type,
content);
-// assertAutoDetect(resource, badResource, type, null,
content);
-// assertAutoDetect(resource, badResource, type, wrongMimeType,
content);
+ final String badResource = "a.xyz";
+ assertAutoDetect(resource, badResource, type, type, content);
+ assertAutoDetect(resource, badResource, type, null, content);
+ assertAutoDetect(resource, badResource, type, wrongMimeType, content);
}
@@ -146,6 +146,10 @@
assertAutoDetect("testPPT.ppt", POWERPOINT, "Sample Powerpoint Slide");
}
+ public void testRdfXml() throws Exception {
+ assertAutoDetect("testRDF.rdf", "application/rdf+xml", "");
+ }
+
public void testRTF() throws Exception {
assertAutoDetect("testRTF.rtf", RTF, "indexation Word");
}
@@ -229,7 +233,7 @@
+ " resourceStatedName = " + resourceStatedName + "\n"
+ " realType = " + realType + "\n"
+ " statedType = " + statedType + "\n"
- + " expectedContentFragment = " + realType + "\n";
+ + " expectedContentFragment = " + expectedContentFragment +
"\n";
}
}
}
Added:
lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/testRDF.rdf
URL:
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/testRDF.rdf?rev=825880&view=auto
==============================================================================
---
lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/testRDF.rdf
(added)
+++
lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/testRDF.rdf
Fri Oct 16 13:18:45 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ <rdf:Description
+ rdf:about="http://lucene.apache.org/tika/";
+ dc:title="Apache Tika"/>
+</rdf:RDF>
