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 2014/10/10 15:09:22 UTC
svn commit: r1630887 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Author: kwright
Date: Fri Oct 10 13:09:22 2014
New Revision: 1630887
URL: http://svn.apache.org/r1630887
Log:
Pull up fix for CONNECTORS-1066 from trunk.
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1630885
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1630887&r1=1630886&r2=1630887&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Oct 10 13:09:22 2014
@@ -3,6 +3,11 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1066: Do not include blank or null fixed fields in Solr
+documents; also, provide facility to strip empty fields from general
+metadata in Metadata Adjuster.
+(Alessandro Benedetti, Shinichiro Abe, Karl Wright)
+
CONNECTORS-1068: Enhancements for Document Filter transformation
connector.
(Karl Wright)
Modified: manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1630887&r1=1630886&r2=1630887&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Fri Oct 10 13:09:22 2014
@@ -58,6 +58,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.SolrInputDocument;
+import org.apache.commons.lang.StringUtils;
/**
* Posts an input stream to SOLR
@@ -1034,7 +1035,7 @@ public class HttpPoster
if ( fileNameAttributeName != null )
{
String fileName = document.getFileName();
- if ( fileName != null )
+ if ( !StringUtils.isBlank(fileName) )
{
outputDoc.addField( fileNameAttributeName, fileName );
}
@@ -1042,7 +1043,7 @@ public class HttpPoster
if ( mimeTypeAttributeName != null )
{
String mimeType = document.getMimeType();
- if ( mimeType != null )
+ if ( !StringUtils.isBlank(mimeType) )
{
outputDoc.addField( mimeTypeAttributeName, mimeType );
}
@@ -1102,13 +1103,13 @@ public class HttpPoster
if (fileNameAttributeName != null)
{
String fileName = document.getFileName();
- if (fileName != null)
+ if (!StringUtils.isBlank(fileName))
writeField(out,LITERAL+fileNameAttributeName,fileName);
}
if (mimeTypeAttributeName != null)
{
String mimeType = document.getMimeType();
- if (mimeType != null)
+ if (!StringUtils.isBlank(mimeType))
writeField(out,LITERAL+mimeTypeAttributeName,mimeType);
}
@@ -1136,7 +1137,7 @@ public class HttpPoster
//writeField(out,LITERAL+"stream_name",document.getFileName());
// General hint for Tika
- if (document.getFileName() != null)
+ if (!StringUtils.isBlank(document.getFileName()))
writeField(out,"resource.name",document.getFileName());
// Write the commitWithin parameter