svn commit: r585561 - in /incubator/tika/trunk/src: main/java/org/apache/tika/metadata/Metadata.java main/java/org/apache/tika/parser/AutoDetectParser.java test/java/org/apache/tika/parser/AutoDetectParserTest.java

[kbennett]

Author: kbennett
Date: Wed Oct 17 09:30:25 2007
New Revision: 585561

URL: http://svn.apache.org/viewvc?rev=585561&view=rev
Log:
TIKA-72: Added Metadata.RESOURCE_NAME_KEY, and changed uses of "filename" to it.

Modified:
    incubator/tika/trunk/src/main/java/org/apache/tika/metadata/Metadata.java
    
incubator/tika/trunk/src/main/java/org/apache/tika/parser/AutoDetectParser.java
    
incubator/tika/trunk/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java

Modified: 
incubator/tika/trunk/src/main/java/org/apache/tika/metadata/Metadata.java
URL: 
http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/java/org/apache/tika/metadata/Metadata.java?rev=585561&r1=585560&r2=585561&view=diff
==============================================================================
--- incubator/tika/trunk/src/main/java/org/apache/tika/metadata/Metadata.java 
(original)
+++ incubator/tika/trunk/src/main/java/org/apache/tika/metadata/Metadata.java 
Wed Oct 17 09:30:25 2007
@@ -31,6 +31,9 @@
 public class Metadata implements CreativeCommons, DublinCore, HttpHeaders,
     MSOffice, TikaMimeKeys {
 
+
+  public static final String RESOURCE_NAME_KEY = "resourceName";
+
   /**
    * A map of all metadata attributes.
    */

Modified: 
incubator/tika/trunk/src/main/java/org/apache/tika/parser/AutoDetectParser.java
URL: 
http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/java/org/apache/tika/parser/AutoDetectParser.java?rev=585561&r1=585560&r2=585561&view=diff
==============================================================================
--- 
incubator/tika/trunk/src/main/java/org/apache/tika/parser/AutoDetectParser.java 
(original)
+++ 
incubator/tika/trunk/src/main/java/org/apache/tika/parser/AutoDetectParser.java 
Wed Oct 17 09:30:25 2007
@@ -118,7 +118,7 @@
         }
 
         // Get (or verify) type based on filename hint (if available)
-        String filename = metadata.get("filename");
+        String filename = metadata.get(Metadata.RESOURCE_NAME_KEY);
         if (filename != null) {
             MimeType match = types.getMimeType(filename);
             if (match != null && (type == null || !type.matches(filename))) {

Modified: 
incubator/tika/trunk/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
URL: 
http://svn.apache.org/viewvc/incubator/tika/trunk/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=585561&r1=585560&r2=585561&view=diff
==============================================================================
--- 
incubator/tika/trunk/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
 (original)
+++ 
incubator/tika/trunk/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
 Wed Oct 17 09:30:25 2007
@@ -32,7 +32,7 @@
             AutoDetectParserTest.class.getResourceAsStream(resource);
         try {
             Metadata metadata = new Metadata();
-            metadata.set("filename", resource);
+            metadata.set(Metadata.RESOURCE_NAME_KEY, resource);
             metadata.set(Metadata.CONTENT_TYPE, type);
             StringWriter writer = new StringWriter();
             ContentHandler handler = new WriteOutContentHandler(writer);