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/07/07 16:12:15 UTC
svn commit: r1608466 - in /manifoldcf/branches/CONNECTORS-989-2/framework:
agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/
agents/src/main/java/org/apache/manifoldcf/agents/interfaces/
pull-agent/src/main/java/org/apache/manifoldcf...
Author: kwright
Date: Mon Jul 7 14:12:14 2014
New Revision: 1608466
URL: http://svn.apache.org/r1608466
Log:
Fix compilation errors
Modified:
manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IngestStatuses.java
manifoldcf/branches/CONNECTORS-989-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
Modified: manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1608466&r1=1608465&r2=1608466&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Mon Jul 7 14:12:14 2014
@@ -1557,7 +1557,8 @@ public class IncrementalIngester extends
if (authorityName == null)
authorityName = "";
int indexValue = position.intValue();
- rval.addStatus(identifierClasses[indexValue],identifierHashes[indexValue],outputConnectionName,
+ // MHL
+ rval.addStatus(identifierClasses[indexValue],identifierHashes[indexValue],null,outputConnectionName,
new DocumentIngestStatus(lastVersion,lastTransformationVersion,lastOutputVersion,paramVersion,authorityName));
}
}
Modified: manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IngestStatuses.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IngestStatuses.java?rev=1608466&r1=1608465&r2=1608466&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IngestStatuses.java (original)
+++ manifoldcf/branches/CONNECTORS-989-2/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IngestStatuses.java Mon Jul 7 14:12:14 2014
@@ -37,25 +37,27 @@ public class IngestStatuses
/** Add a status record.
*@param documentClass is the document class.
*@param documentIDHash is the document id's hash value.
+ *@param childIDHash is the child ID hash value, or null if primary.
*@param outputConnectionName is the output connection name.
*@param status is the status record.
*/
- public void addStatus(String documentClass, String documentIDHash, String outputConnectionName, DocumentIngestStatus status)
+ public void addStatus(String documentClass, String documentIDHash, String childIDHash, String outputConnectionName, DocumentIngestStatus status)
{
+ // MHL
statuses.put(new OutputKey(documentClass,documentIDHash,outputConnectionName),status);
}
- /** Retrieve a status record.
+ /** Get all statuses for a document class and ID hash.
*@param documentClass is the document class.
*@param documentIDHash is the document id's hash value.
- *@param outputConnectionName is the output connection name.
- *@return the status record, if record.
+ *@return the statuses in a map keyed by output connection name, with a secondary map keyed by child ID
*/
- public DocumentIngestStatus getStatus(String documentClass, String documentIDHash, String outputConnectionName)
+ public Map<String,Map<String,DocumentIngestStatus>> getStatuses(String documentClass, String documentIDHash)
{
- return statuses.get(new OutputKey(documentClass,documentIDHash,outputConnectionName));
+ // MHL
+ return null;
}
-
+
protected static class OutputKey
{
protected final String documentClass;
Modified: manifoldcf/branches/CONNECTORS-989-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-989-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java?rev=1608466&r1=1608465&r2=1608466&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-989-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java (original)
+++ manifoldcf/branches/CONNECTORS-989-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java Mon Jul 7 14:12:14 2014
@@ -218,7 +218,6 @@ public class StufferThread extends Threa
IJobDescription[] jobs = new IJobDescription[descs.length];
IRepositoryConnection[] connections = new IRepositoryConnection[descs.length];
- Map[] versions = new HashMap[descs.length];
IPipelineSpecificationBasic[] pipelineSpecifications = new IPipelineSpecificationBasic[descs.length];
String[] documentClasses = new String[descs.length];
String[] documentIDHashes = new String[descs.length];
@@ -250,18 +249,6 @@ public class StufferThread extends Threa
IngestStatuses statuses = new IngestStatuses();
ingester.getPipelineDocumentIngestDataMultiple(statuses,pipelineSpecifications,documentClasses,documentIDHashes);
- // Break apart the result.
- for (int i = 0; i < descs.length; i++)
- {
- versions[i] = new HashMap<String,DocumentIngestStatus>();
- for (int j = 0; j < pipelineSpecifications[i].getOutputCount(); j++)
- {
- String outputName = pipelineSpecifications[i].getStageConnectionName(pipelineSpecifications[i].getOutputStage(j));
- DocumentIngestStatus status = statuses.getStatus(documentClasses[i],documentIDHashes[i],outputName);
- if (status != null)
- versions[i].put(outputName,status);
- }
- }
// We need to go through the list, and segregate them by job, so the individual
// connectors can work in batch.
@@ -334,8 +321,7 @@ public class StufferThread extends Threa
binNames = new String[]{""};
}
- // ???
- QueuedDocument qd = new QueuedDocument(descs[i],(Map<String,DocumentIngestStatus>)versions[i],binNames);
+ QueuedDocument qd = new QueuedDocument(descs[i],statuses.getStatuses(documentClasses[i],documentIDHashes[i]),binNames);
// Grab the arraylist that's there, or create it.
List<QueuedDocument> set = documentSets.get(jobID);