You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/06/07 19:28:15 UTC
svn commit: r1490740 - in /manifoldcf/trunk: ./
connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/
connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/
Author: kwright
Date: Fri Jun 7 17:28:14 2013
New Revision: 1490740
URL: http://svn.apache.org/r1490740
Log:
Fix for CONNECTORS-707.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1490740&r1=1490739&r2=1490740&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jun 7 17:28:14 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.3-dev =====================
+CONNECTORS-707: Treat special character "." as meaning "no extension",
+for ElasticSearch and OpenSearchServer output connectors.
+(TC Tobin-Campbell, Karl Wright)
+
CONNECTORS-708: Make JDBC connector check mime type for indexability,
if it is present.
(Richard Nichols, Karl Wright)
Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java?rev=1490740&r1=1490739&r2=1490740&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java Fri Jun 7 17:28:14 2013
@@ -156,8 +156,9 @@ public class ElasticSearchSpecs extends
public boolean checkExtension(String extension)
{
- if (extension == null)
- extension = "";
+ if (extension == null || extension.length() == 0)
+ // Special character to match - see CONNECTORS-707
+ extension = ".";
return extensionSet.contains(extension);
}
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java?rev=1490740&r1=1490739&r2=1490740&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java Fri Jun 7 17:28:14 2013
@@ -145,10 +145,15 @@ public class OpenSearchServerSpecs exten
}
public boolean checkExtension(String extension) {
+ if (extension == null || extension.length() == 0)
+ // Special character to match - see CONNECTORS-707
+ extension = ".";
return extensionSet.contains(extension);
}
public boolean checkMimeType(String mimeType) {
+ if (mimeType == null)
+ mimeType = "application/unknown";
return mimeTypeSet.contains(mimeType);
}
}