You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2019/09/24 20:15:43 UTC
svn commit: r1867494 - in
/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws:
handlers/experiments/HandlerExperimentsAbstract.java
handlers/experiments/HandlerExperimentsServlets.java
server/DuccAbstractHandler.java
Author: burn
Date: Tue Sep 24 20:15:42 2019
New Revision: 1867494
URL: http://svn.apache.org/viewvc?rev=1867494&view=rev
Log:
UIMA-6114 Fix bug that prevented the job details from being displayed on the experiment details page
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsServlets.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java?rev=1867494&r1=1867493&r2=1867494&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java Tue Sep 24 20:15:42 2019
@@ -44,8 +44,6 @@ public abstract class HandlerExperiments
// NOTE - this variable used to hold the class name before WsLog was simplified
private static DuccLogger cName = DuccLogger.getLogger(HandlerExperimentsAbstract.class);
- private static DuccData duccData = DuccData.getInstance();
-
public final String duccContext = DuccLocalConstants.duccContext;
protected DuccWebServer duccWebServer = null;
@@ -116,6 +114,7 @@ public abstract class HandlerExperiments
public String getDispatch(IDuccWorkJob job) {
String retVal = "";
+ DuccData duccData = DuccData.getInstance();
if (duccData.isLive(job.getDuccId())) {
int unassigned = job.getSchedulingInfo().getCasQueuedMap().size();
try {
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsServlets.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsServlets.java?rev=1867494&r1=1867493&r2=1867494&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsServlets.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsServlets.java Tue Sep 24 20:15:42 2019
@@ -78,8 +78,6 @@ public class HandlerExperimentsServlets
private static ExperimentsRegistryManager experimentsRegistryManager = ExperimentsRegistryManager
.getInstance();
- private static DuccData duccData = DuccData.getInstance();
-
protected boolean terminateEnabled = true;
public HandlerExperimentsServlets(DuccWebServer duccWebServer) {
@@ -335,6 +333,7 @@ public class HandlerExperimentsServlets
String disabled = "";
String resourceOwnerUserid = experiment.getUser();
if (!HandlersHelper.isUserAuthorized(request, resourceOwnerUserid)) {
+ // Set the disabled attribute and a hover for the greyed-out button
disabled = "disabled title=\"Hint: use Login to enable\"";
}
String p0 = "'" + id + "'";
@@ -512,9 +511,9 @@ public class HandlerExperimentsServlets
}
public enum ExperimentDetailsColumns {
- Id(0), Name(1), Parent(2), State(3), Type(4), StepStart(5), StepDuration(6), DuccId(
- 7), DuccDuration(
- 8), Total(9), Done(10), Error(11), Dispatch(12), Retry(13), Preempt(14);
+ Id(0), Name(1), Parent(2), State(3), Type(4), StepStart(5), StepDuration(6), DuccId(7),
+ DuccDuration(8), Total(9), Done(10), Error(11), Dispatch(12), Retry(13), Preempt(14);
+
private int index;
ExperimentDetailsColumns(int index) {
@@ -651,18 +650,15 @@ public class HandlerExperimentsServlets
case Java:
case Trainer:
for (int duccId : duccIdList) {
+ String link;
if (duccId < 0) {
String parm = "" + (0 - duccId);
- String displayId = "r" + parm;
- String link = "<a href=\"reservation.details.html?id=" + parm + "\">" + displayId
- + "</a>";
- db.append(link + " ");
+ link = "<a href=\"reservation.details.html?id=" + parm + "\">" + parm + "</a> ";
} else {
String parm = "" + (0 + duccId);
- String displayId = "j" + parm;
- String link = "<a href=\"job.details.html?id=" + parm + "\">" + displayId + "</a>";
- db.append(link + " ");
+ link = "<a href=\"job.details.html?id=" + parm + "\">" + parm + "</a> ";
}
+ db.append(link);
}
break;
case Other:
@@ -697,6 +693,7 @@ public class HandlerExperimentsServlets
cbList[index].append(projection);
}
} catch (Exception e) {
+ WsLog.error(cName, "edDuccDuration", e);
}
cbList[index].append("</td>");
}
@@ -760,6 +757,7 @@ public class HandlerExperimentsServlets
int index = ExperimentDetailsColumns.Dispatch.getIndex();
cbList[index].append("<td valign=\"bottom\" align=\"right\">");
try {
+ DuccData duccData = DuccData.getInstance();
if (duccData.isLive(job.getDuccId())) {
int dispatch = 0;
int unassigned = job.getSchedulingInfo().getCasQueuedMap().size();
@@ -820,6 +818,7 @@ public class HandlerExperimentsServlets
private void edTaskDuccFirst(StringBuffer[] cbList, IExperiment experiment, Task task,
HttpServletRequest request, IdBundle idBundle, long now) {
+ DuccData duccData = DuccData.getInstance();
int[] duccIdList = idBundle.getList();
// WsLog.info(cName, "edTaskDuccFirst", "!! #ids = "+duccIdList.length);
edId(cbList, task);
@@ -868,6 +867,7 @@ public class HandlerExperimentsServlets
private void edTaskDuccNext(StringBuffer[] cbList, Task task, HttpServletRequest request,
IdBundle idBundle, long now) {
+ DuccData duccData = DuccData.getInstance();
int[] duccIdList = idBundle.getList();
// WsLog.info(cName, "edTaskDuccNext", "!! #ids = "+duccIdList.length);
addPlaceholder(cbList, ExperimentDetailsColumns.Id.getIndex());
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1867494&r1=1867493&r2=1867494&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java Tue Sep 24 20:15:42 2019
@@ -106,8 +106,9 @@ public abstract class DuccAbstractHandle
public String dir_home = Utils.findDuccHome();
public String dir_resources = "resources";
- protected boolean terminateEnabled = true;
- protected boolean buttonsEnabled = true;
+ // Always true so could be removed ?
+ protected boolean terminateEnabled = true; // Display Terminate button for running Jobs, Managed Reservations & Experiments
+ protected boolean buttonsEnabled = true; // Display Enable/Stop buttons for services
public static final String valueStateTypeAll = "all";
public static final String valueStateTypeActive = "active";