svn commit: r1532855 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java

[de...@apache.org]

Author: degenaro
Date: Wed Oct 16 18:36:16 2013
New Revision: 1532855

URL: http://svn.apache.org/r1532855
Log:
UIMA-3351 DUCC orchestrator (OR) should not count Time Run for JP's that are not used

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.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=1532855&r1=1532854&r2=1532855&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 Wed Oct 16 18:36:16 2013
@@ -623,26 +623,48 @@ public class DuccHandler extends DuccAbs
 		String rtd1 = "</td>";
 		String rsp0 = "<span>";
 		String rsp1 = "</span>";
-		try {
-			TimeWindow t = (TimeWindow) process.getTimeWindowRun();
-			if(t != null) {
-				long now = System.currentTimeMillis();
-				String tS = t.getStart(""+now);
-				String tE = t.getEnd(""+now);
-				runTime = getDuration(jobid,tE,tS);
-				if(t.isEstimated()) {
-					rsp0 = "<span title=\"estimated\" class=\"health_green\">";
-				}
-				else {
-					rsp0 = "<span class=\"health_black\">";
-				}
+		// <UIMA-3351>
+		boolean useTimeRun = true;
+		switch(type) {
+		case SPC:
+			break;
+		case SPU:
+			break;
+		case MR:
+			break;
+		case JD:
+			break;	
+		case UIMA:
+			if(!process.isAssignedWork()) {
+				useTimeRun = false;
 			}
+			break;	
+		default:
+			break;
 		}
-		catch(Exception e) {
-			duccLogger.trace(location, jobid, "no worries", e);
-		}
-		catch(Throwable t) {
-			duccLogger.trace(location, jobid, "no worries", t);
+		// </UIMA-3351>
+		if(useTimeRun) {
+			try {
+				TimeWindow t = (TimeWindow) process.getTimeWindowRun();
+				if(t != null) {
+					long now = System.currentTimeMillis();
+					String tS = t.getStart(""+now);
+					String tE = t.getEnd(""+now);
+					runTime = getDuration(jobid,tE,tS);
+					if(t.isEstimated()) {
+						rsp0 = "<span title=\"estimated\" class=\"health_green\">";
+					}
+					else {
+						rsp0 = "<span class=\"health_black\">";
+					}
+				}
+			}
+			catch(Exception e) {
+				duccLogger.trace(location, jobid, "no worries", e);
+			}
+			catch(Throwable t) {
+				duccLogger.trace(location, jobid, "no worries", t);
+			}
 		}
 		sb.append(rtd0);
 		sb.append(rsp0);