Author: kwright
Date: Thu Feb 6 17:25:23 2014
New Revision: 1565362
URL: http://svn.apache.org/r1565362
Log:
Fix for CONNECTORS-884
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=1565362&r1=1565361&r2=1565362&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Feb 6 17:25:23 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-884: Log successful index/delete in Solr connector.
+(Erlend Garåsen, Karl Wright)
+
CONNECTORS-882: Solr connector: Keep all metadata fixed.
(Alessandro Benedetti, Karl Wright)
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=1565362&r1=1565361&r2=1565362&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
Thu Feb 6 17:25:23 2014
@@ -523,6 +523,9 @@ public class HttpPoster
t.start();
t.finishUp();
+ if (t.getActivityCode() != null)
+
activities.recordActivity(t.getActivityStart(),SolrConnector.INGEST_ACTIVITY,t.getActivityBytes(),documentURI,t.getActivityCode(),t.getActivityDetails());
+
return t.getRval();
}
catch (InterruptedException e)
@@ -641,6 +644,10 @@ public class HttpPoster
{
t.start();
t.finishUp();
+
+ if (t.getActivityCode() != null)
+
activities.recordActivity(t.getActivityStart(),SolrConnector.REMOVE_ACTIVITY,null,documentURI,t.getActivityCode(),t.getActivityDetails());
+
return;
}
catch (InterruptedException e)