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 2011/10/21 10:28:18 UTC

svn commit: r1187210 - in /incubator/lcf/trunk: CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

Author: kwright
Date: Fri Oct 21 08:28:17 2011
New Revision: 1187210

URL: http://svn.apache.org/viewvc?rev=1187210&view=rev
Log:
Fix for CONNECTORS-280.  Some job and jobqueue states were not being adequately reflected in the status reporting in the UI and API.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1187210&r1=1187209&r2=1187210&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri Oct 21 08:28:17 2011
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 0.4-dev =====================
 
+CONNECTORS-280: The job state "DELETESTARTINGUP" was not being
+checked for in the status.  This meant that during the time that a
+job delete was beginning, "Not yet run" would be displayed as the status.
+(Karl Wright)
+
 CONNECTORS-277: Add the ability to select namespaces and title
 prefixes to the Wiki connector.
 (Tobias Wunderlich, Karl Wright)

Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1187210&r1=1187209&r2=1187210&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Fri Oct 21 08:28:17 2011
@@ -6441,6 +6441,7 @@ public class JobManager implements IJobM
       case Jobs.STATUS_READYFORSTARTUP:
         rstatus = JobStatus.JOBSTATUS_STARTING;
         break;
+      case Jobs.STATUS_DELETESTARTINGUP:
       case Jobs.STATUS_READYFORDELETE:
       case Jobs.STATUS_DELETING:
       case Jobs.STATUS_DELETING_NOOUTPUT:
@@ -6518,6 +6519,7 @@ public class JobManager implements IJobM
     
     list.add(jobQueue.statusToString(jobQueue.STATUS_BEINGDELETED));
     list.add(jobQueue.statusToString(jobQueue.STATUS_BEINGCLEANED));
+    list.add(jobQueue.statusToString(jobQueue.STATUS_ELIGIBLEFORDELETE));
     
     list.add(jobQueue.actionToString(jobQueue.ACTION_RESCAN));
     list.add(jobQueue.statusToString(jobQueue.STATUS_ACTIVE));
@@ -6590,9 +6592,9 @@ public class JobManager implements IJobM
       .append(" OR ").append("t0.").append(jobQueue.statusField).append("=?")
       .append(")")
       .append(" THEN 'Waiting forever'")
-      .append(" WHEN (").append("t0.").append(jobQueue.statusField).append("=?")
+      .append(" WHEN ").append("t0.").append(jobQueue.statusField).append("=?")
+      .append(" OR ").append("t0.").append(jobQueue.statusField).append("=?")
       .append(" OR ").append("t0.").append(jobQueue.statusField).append("=?")
-      .append(")")
       .append(" THEN 'Deleting'")
       .append(" WHEN ")
       .append("(t0.").append(jobQueue.checkActionField).append(" IS NULL OR t0.").append(jobQueue.checkActionField).append("=?)")