svn commit: r1337905 - /incubator/any23/trunk/core/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java

[mostarda]

Author: mostarda
Date: Sun May 13 14:57:51 2012
New Revision: 1337905

URL: http://svn.apache.org/viewvc?rev=1337905&view=rev
Log:
Improved Naive MIME type detection logic as per #ANY23-83.

Modified:
    
incubator/any23/trunk/core/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java

Modified: 
incubator/any23/trunk/core/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java
URL: 
http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java?rev=1337905&r1=1337904&r2=1337905&view=diff
==============================================================================
--- 
incubator/any23/trunk/core/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java
 (original)
+++ 
incubator/any23/trunk/core/src/main/java/org/apache/any23/mime/NaiveMIMETypeDetector.java
 Sun May 13 14:57:51 2012
@@ -17,6 +17,9 @@
 
 package org.apache.any23.mime;
 
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.Rio;
+
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -36,14 +39,10 @@ public class NaiveMIMETypeDetector imple
             put("htm"  , "text/html"            );
             put("xhtml", "application/xhtml+xml");
             put("xht"  , "application/xhtml+xml");
-            put("rdf"  , "application/rdf+xml"  );
             put("xrdf" , "application/rdf+xml"  );
             put("rdfx" , "application/rdf+xml"  );
             put("owl"  , "application/rdf+xml"  );
-            put("nt"   , "text/plain"           );
             put("txt"  , "text/plain"           );
-            put("ttl"  , "application/x-turtle" );
-            put("n3"   , "text/rdf+n3"          );
         }
     };
 
@@ -58,6 +57,12 @@ public class NaiveMIMETypeDetector imple
         if (mimeTypeFromMetadata != null) {
             return mimeTypeFromMetadata;
         }
+
+        final RDFFormat parserFormatForFileName = 
Rio.getParserFormatForFileName(fileName);
+        if (parserFormatForFileName != null) {
+            return 
MIMEType.parse(parserFormatForFileName.getDefaultMIMEType());
+        }
+
         String extension = getExtension(fileName);
         if (extension == null) {
             // Assume index file on web server.
@@ -74,5 +79,5 @@ public class NaiveMIMETypeDetector imple
         if (!m.matches()) return null;
         return m.group(1);
     }
-    
+
 }