This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

The following commit(s) were added to refs/heads/master by this push:
       new  d492657   tika-eval fix bug that stores parent file extension 
instead of embedded doc file extension
d492657 is described below

commit d49265731c17a77d543fb28268cbefa5708c85e0
Author: tballison <[email protected]>
AuthorDate: Tue Feb 28 15:53:47 2017 -0500

    tika-eval fix bug that stores parent file extension instead of embedded doc 
file extension
---
 tika-eval/src/main/java/org/apache/tika/eval/AbstractProfiler.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tika-eval/src/main/java/org/apache/tika/eval/AbstractProfiler.java 
b/tika-eval/src/main/java/org/apache/tika/eval/AbstractProfiler.java
index 0e89849..a898e5a 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/AbstractProfiler.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/AbstractProfiler.java
@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -210,15 +211,15 @@ public abstract class AbstractProfiler extends 
FileResourceConsumer {
 
         //if the outer wrapper document
         if (i == 0) {
-
             data.put(Cols.IS_EMBEDDED, FALSE);
             data.put(Cols.FILE_NAME, 
fps.getRelativeSourceFilePath().getFileName().toString());
         } else {
             data.put(Cols.IS_EMBEDDED, TRUE);
             data.put(Cols.FILE_NAME, 
getFileName(m.get(RecursiveParserWrapper.EMBEDDED_RESOURCE_PATH)));
         }
-        data.put(Cols.FILE_EXTENSION,
-                
FilenameUtils.getExtension(fps.getRelativeSourceFilePath().getFileName().toString()));
+        String ext = FilenameUtils.getExtension(data.get(Cols.FILE_NAME));
+        ext = (ext == null) ? "" : ext.toLowerCase(Locale.US);
+        data.put(Cols.FILE_EXTENSION, ext);
         long srcFileLen = getSourceFileLength(m);
         if (srcFileLen > NON_EXISTENT_FILE_LENGTH) {
             data.put(Cols.LENGTH, Long.toString(srcFileLen));

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to