You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/10/27 12:27:45 UTC

svn commit: r1536100 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server: DuccHandler.java DuccHandlerJsonFormat.java DuccHandlerLegacy.java

Author: degenaro
Date: Sun Oct 27 11:27:44 2013
New Revision: 1536100

URL: http://svn.apache.org/r1536100
Log:
UIMA-3365 WS must properly display dispatch and unassigned counts

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1536100&r1=1536099&r2=1536100&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Sun Oct 27 11:27:44 2013
@@ -1091,20 +1091,28 @@ public class DuccHandler extends DuccAbs
 		case Undefined:
 			break;
 		default:
+			int dispatch = 0;
+			int unassigned = job.getSchedulingInfo().getCasQueuedMap().size();
+			int limbo = job.getSchedulingInfo().getLimboMap().size();
+			try {
+				dispatch = Integer.parseInt(job.getSchedulingInfo().getWorkItemsDispatched())-unassigned;
+			}
+			catch(Exception e) {
+			}
 			// dispatch
 			sb.append("<th title=\"The number of work items currently dispatched\">");
 			sb.append("Dispatch: ");
-			sb.append(job.getSchedulingInfo().getWorkItemsDispatched());
+			sb.append(dispatch);
 			sb.append("&nbsp");
 			// unassigned
 			sb.append("<th title=\"The number of work items currently dispatched for which acknowledgement is yet to be received\">");
 			sb.append("Unassigned: ");
-			sb.append(job.getSchedulingInfo().getCasQueuedMap().size());
+			sb.append(unassigned);
 			sb.append("&nbsp");
 			// limbo
 			sb.append("<th title=\"The number of work items pending re-dispatch to an alternate Job Process. Each of these work items is essentially stuck waiting for its previous JP to terminate.\">");
 			sb.append("Limbo: ");
-			sb.append(job.getSchedulingInfo().getLimboMap().size());
+			sb.append(limbo);
 			sb.append("&nbsp");
 			break;
 		}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1536100&r1=1536099&r2=1536100&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Sun Oct 27 11:27:44 2013
@@ -315,7 +315,14 @@ public class DuccHandlerJsonFormat exten
 		sb = new StringBuffer();
 		sb.append("<span>");
 		if(duccData.isLive(duccId)) {
-			sb.append(job.getSchedulingInfo().getWorkItemsDispatched());
+			int dispatch = 0;
+			int unassigned = job.getSchedulingInfo().getCasQueuedMap().size();
+			try {
+				dispatch = Integer.parseInt(job.getSchedulingInfo().getWorkItemsDispatched())-unassigned;
+			}
+			catch(Exception e) {
+			}
+			sb.append(dispatch);
 		}
 		else {
 			sb.append("0");

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1536100&r1=1536099&r2=1536100&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java Sun Oct 27 11:27:44 2013
@@ -281,7 +281,14 @@ public class DuccHandlerLegacy extends D
 		// Dispatch
 		sb.append("<td valign=\"bottom\" align=\"right\">");
 		if(duccData.isLive(duccId)) {
-			sb.append(job.getSchedulingInfo().getWorkItemsDispatched());
+			int dispatch = 0;
+			int unassigned = job.getSchedulingInfo().getCasQueuedMap().size();
+			try {
+				dispatch = Integer.parseInt(job.getSchedulingInfo().getWorkItemsDispatched())-unassigned;
+			}
+			catch(Exception e) {
+			}
+			sb.append(dispatch);
 		}
 		else {
 			sb.append("0");