svn commit: r1626091 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt connectors/documentfilter/connector/src/main/java/org/apache/manifoldcf/agents/transformation/documentfilter/DocumentFilter.java

[kwright]

Author: kwright
Date: Thu Sep 18 21:29:00 2014
New Revision: 1626091

URL: http://svn.apache.org/r1626091
Log:
Pull up fix for CONNECTORS-1039 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    
manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/java/org/apache/manifoldcf/agents/transformation/documentfilter/DocumentFilter.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1626090

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1626091&r1=1626090&r2=1626091&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Thu Sep 18 21:29:00 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1039: Use a URL-centric way of getting the extension
+for document filtering.
+(David Morana, Karl Wright)
+
 CONNECTORS-1038: Handle multiple pool closes properly.
 (Karl Wright)
 

Modified: 
manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/java/org/apache/manifoldcf/agents/transformation/documentfilter/DocumentFilter.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/java/org/apache/manifoldcf/agents/transformation/documentfilter/DocumentFilter.java?rev=1626091&r1=1626090&r2=1626091&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/java/org/apache/manifoldcf/agents/transformation/documentfilter/DocumentFilter.java
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/java/org/apache/manifoldcf/agents/transformation/documentfilter/DocumentFilter.java
 Thu Sep 18 21:29:00 2014
@@ -28,6 +28,7 @@ import org.apache.commons.io.FilenameUti
 
 import java.io.*;
 import java.util.*;
+import java.net.*;
 
 public class DocumentFilter extends 
org.apache.manifoldcf.agents.transformation.BaseTransformationConnector {
 
@@ -481,7 +482,17 @@ public class DocumentFilter extends org.
     }
     
     public boolean checkURLIndexable(String url) {
-      String extension = FilenameUtils.getExtension(url);
+      String extension = null;
+      try
+      {
+        String path = new URI(url).getPath();
+        if (path != null)
+          extension = FilenameUtils.getExtension(path);
+      }
+      catch (URISyntaxException e)
+      {
+        extension = FilenameUtils.getExtension(url);
+      }
       if (extension == null || extension.length() == 0)
         extension = ".";
       return extensions.contains(extension.toLowerCase(Locale.ROOT));