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 2018/04/25 13:49:09 UTC
svn commit: r1830074 - in /manifoldcf/trunk: CHANGES.txt
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Author: kwright
Date: Wed Apr 25 13:49:09 2018
New Revision: 1830074
URL: http://svn.apache.org/viewvc?rev=1830074&view=rev
Log:
Tentative fix for CONNECTORS-1503.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1830074&r1=1830073&r2=1830074&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Apr 25 13:49:09 2018
@@ -3,6 +3,8 @@ $Id$
======================= 2.11-dev =====================
+CONNECTORS-1503: Fix for Solr standard update handler
+parameter transmission to Solr.
======================= Release 2.10 =====================
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1830074&r1=1830073&r2=1830074&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Wed Apr 25 13:49:09 2018
@@ -964,18 +964,24 @@ public class HttpPoster
UpdateResponse response;
if ( useExtractUpdateHandler )
{
- response = contentStreamUpdateRequest.process( solrServer );
+ response = contentStreamUpdateRequest.process(solrServer);
}
else
{
- if (commitWithin != null)
+ final ModifiableSolrParams params = new ModifiableSolrParams();
+ // Write the arguments
+ for (final String name : arguments.keySet())
{
- response = solrServer.add( currentSolrDoc, Integer.parseInt(commitWithin) );
+ final List<String> values = arguments.get(name);
+ writeField(params, name, values);
}
- else
- {
- response = solrServer.add( currentSolrDoc );
+ final UpdateRequest req = new UpdateRequest();
+ req.setParams(params);
+ req.add(currentSolrDoc);
+ if (commitWithin != null) {
+ req.setCommitWithin(Integer.parseInt(commitWithin));
}
+ response = req.process(solrServer);
}
// Successful completion
@@ -1125,13 +1131,6 @@ public class HttpPoster
writeACLsInSolrDoc(outputDoc,aclType,aclsMap.get(aclType),denyAclsMap.get(aclType));
}
- // Write the arguments
- for ( String name : arguments.keySet() )
- {
- List<String> values = arguments.get( name );
- outputDoc.addField( name, values );
- }
-
// Write the metadata, each in a field by itself
buildSolrParamsFromMetadata( outputDoc );