Author: kwright
Date: Mon Jul 14 23:35:57 2014
New Revision: 1610561
URL: http://svn.apache.org/r1610561
Log:
Remove debugging output
Modified:
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Modified:
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java?rev=1610561&r1=1610560&r2=1610561&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
Mon Jul 14 23:35:57 2014
@@ -369,7 +369,6 @@ public abstract class BaseRepositoryConn
{
if (dv.isAlwaysRefetch(documentIdentifier) ||
activities.checkDocumentNeedsReindexing(documentIdentifier,vc.getVersionString()))
{
- System.out.println("Reprocessing "+documentIdentifier+"; computed
version string = '"+vc.getVersionString()+"'; old version string=
'"+oldVersions[i]+"'; alwaysRefetch="+dv.isAlwaysRefetch(documentIdentifier));
// These documents need reprocessing
fetchDocuments.add(documentIdentifier);
}
Modified:
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1610561&r1=1610560&r2=1610561&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
(original)
+++
manifoldcf/branches/CONNECTORS-990/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Mon Jul 14 23:35:57 2014
@@ -290,7 +290,6 @@ public class WorkerThread extends Thread
try
{
pipelineSpecification = new
PipelineSpecification(pipelineSpecificationBasic,job,ingester);
- System.out.println("Obtained pipeline specification");
}
catch (ServiceInterruption e)
{
@@ -343,7 +342,6 @@ public class WorkerThread extends Thread
// **** New worker thread code starts here!!! ****
IExistingVersions existingVersions = new
ExistingVersions(lastIndexedOutputConnectionName,activeDocuments);
- System.out.println("Built existingVersions");
String aclAuthority = connection.getACLAuthority();
if (aclAuthority == null)
aclAuthority = "";
@@ -363,7 +361,6 @@ public class WorkerThread extends Thread
documentIDs[i] =
qd.getDocumentDescription().getDocumentIdentifier();
documentIDHashes[i] =
qd.getDocumentDescription().getDocumentIdentifierHash();
}
- System.out.println("Built fetchPipelineSpecifications");
ProcessActivity activity = new
ProcessActivity(job.getID(),processID,
threadContext,rt,jobManager,ingester,
@@ -385,16 +382,13 @@ public class WorkerThread extends Thread
// Now, process in bulk -- catching and handling
ServiceInterruptions
try
{
- System.out.println("Processing documents");
connector.processDocuments(documentIDs,existingVersions,job.getSpecification(),activity,jobType,isDefaultAuthority);
- System.out.println("Done processing documents");
for (QueuedDocument qd : activeDocuments)
{
// If this document was aborted, then treat it
specially.
if
(activity.wasDocumentAborted(qd.getDocumentDescription().getDocumentIdentifier()))
{
- System.out.println("Document was aborted");
// Special treatment for aborted documents.
// We ignore the returned version string
completely, since it's presumed that processing was not completed for this doc.
// We want to give up immediately on this one, and
just requeue it for immediate reprocessing (pending its prereqs being all met).
@@ -407,19 +401,16 @@ public class WorkerThread extends Thread
// If the document is not being deleted, add it to
the finish set.
if
(activity.wasDocumentProcessed(qd.getDocumentDescription().getDocumentIdentifier()))
{
- System.out.println("Document was processed");
finishList.add(qd);
}
else if
(activity.wasDocumentUnchanged(qd.getDocumentDescription().getDocumentIdentifier()))
{
- System.out.println("Document was unchanged");
finishList.add(qd);
ingesterCheckList.add(qd.getDocumentDescription().getDocumentIdentifierHash());
}
else
{
// Anything else means that the document was not
found and should be deleted, eventually.
- System.out.println("Document was neither
processed nor unchanged");
// We can't just delete because of connector
backwards compatibility. The case in question
// is handling documents that are not indexed,
such as file system directories. To prevent
// the job from not terminating, we have to add
this document to the finish list so that it gets
@@ -439,7 +430,6 @@ public class WorkerThread extends Thread
ManifoldCF.requeueDocumentsDueToCarrydown(jobManager,
requeueCandidates,connector,connection,rt,currentTime);
- System.out.println("Done requeuing
"+requeueCandidates.length+" documents");
if (Logging.threads.isDebugEnabled())
Logging.threads.debug("Worker thread done processing
"+Integer.toString(documentIDs.length)+" documents");
}
@@ -518,7 +508,6 @@ public class WorkerThread extends Thread
// the statistics (which are calculated during the
finishlist step below)
if (ingesterCheckList.size() > 0)
{
- System.out.println("ingesterCheckList has
"+ingesterCheckList.size()+" documents");
String[] checkClasses = new
String[ingesterCheckList.size()];
String[] checkIDs = new
String[ingesterCheckList.size()];
for (int i = 0; i < checkIDs.length; i++)
@@ -532,7 +521,6 @@ public class WorkerThread extends Thread
// Process the finish list!
if (finishList.size() > 0)
{
- System.out.println("Finishing "+finishList.size()+"
documents");
// In both job types, we have to go through the
finishList to figure out what to do with the documents.
// In the case of a document that was aborted, we must
requeue it for immediate reprocessing in BOTH job types.
switch (job.getType())
@@ -672,7 +660,6 @@ public class WorkerThread extends Thread
}
// Finally, if we're still alive, mark everything we
finished as "processed".
- System.out.println("Marking "+finishList.size()+"
documents as processed");
for (QueuedDocument qd : finishList)
{
qd.setProcessed();
@@ -693,13 +680,11 @@ public class WorkerThread extends Thread
}
// Now, handle the delete list
- System.out.println("Deleting "+deleteList.size()+"
documents");
processDeleteLists(pipelineSpecificationBasic,connector,connection,jobManager,
deleteList,ingester,
job.getID(),legalLinkTypes,ingestLogger,job.getHopcountMode(),rt,currentTime);
// Handle hopcount removal
- System.out.println("Doing hopcount removal on
"+hopcountremoveList.size()+" documents");
processHopcountRemovalLists(pipelineSpecificationBasic,connector,connection,jobManager,
hopcountremoveList,ingester,
job.getID(),legalLinkTypes,ingestLogger,job.getHopcountMode(),rt,currentTime);
