Author: burn
Date: Wed Oct 2 22:30:34 2019
New Revision: 1867900
URL: http://svn.apache.org/viewvc?rev=1867900&view=rev
Log:
UIMA-6130 Fix problems with experiments pages - sorting & scroll view
Added:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/FormatServlet.java
(with props)
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/FormatServletClassic.java
(with props)
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/FormatServletScroll.java
(with props)
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/handlers/utilities/HandlersUtilities.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/utilities/ResponseHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccLocalConstants.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/experiment.details.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/experiments.html
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/experiments.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.local.js
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=1867900&r1=1867899&r2=1867900&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
Wed Oct 2 22:30:34 2019
@@ -56,45 +56,7 @@ public abstract class HandlerExperiments
return HandlersUtilities.isIgnorable(t);
}
- public String getFmtDuration(IDuccWorkJob job, HttpServletRequest request,
long now) {
-String retVal = "";
-StringBuffer tb = new StringBuffer();
-if (job.isCompleted()) {
- String duration = getDuration(request, job);
- String decoratedDuration = decorateDuration(request, job, duration);
- tb.append("");
- tb.append(decoratedDuration);
- tb.append("");
- retVal = tb.toString();
-} else {
- String duration = getDuration(request, job, now);
- String decoratedDuration = decorateDuration(request, job, duration);
- tb.append("");
- tb.append(decoratedDuration);
- tb.append("");
- String projection = getProjection(request, job);
- tb.append(projection);
- retVal = tb.toString();
-}
-return retVal;
- }
-
- public String getLink(IDuccWorkJob job) {
-String retVal = "";
-String parm = job.getDuccId().toString();
-String displayId = "j" + parm;
-String link = "" + displayId
+ "";
-retVal = link;
-return retVal;
- }
-
- public String getTotal(IDuccWorkJob job) {
-String retVal = "";
-String total = job.getSchedulingInfo().getWorkItemsTotal();
-retVal = total;
-return retVal;
- }
-
+ // Not used ?
public String getDone(IDuccWorkJob job) {
String retVal = "";
String done = job.getSchedulingInfo().getWorkItemsCompleted();
@@ -129,31 +91,13 @@ public abstract class HandlerExperiments
return retVal;
}
- public String getError(IDuccWorkJob job) {
-String retVal = "";
-retVal = buildErrorLink(job);
-return retVal;
- }
-
- public String getRetry(IDuccWorkJob job) {
-String retVal = "";
-retVal = job.getSchedulingInfo().getWorkItemsRetry();
-return retVal;
- }
-
- public String getPreempt(IDuccWorkJob job) {
-String retVal = "";
-retVal = job.getSchedulingInfo().getWorkItemsPreempt();
-return retVal;
- }
-
public String buildErrorLink(IDuccWorkJob job) {
return (buildErrorLink(job, null));
}
public final String duccLogData = duccContext + "/log-data";
- public String buildErrorLink(IDuccWorkJob job, String name) {
+ private String buildErrorLink(IDuccWorkJob job, String name) {
String retVal = job.getSchedulingInfo().getWorkItemsError();
if (!retVal.equals("0")) {
String errorCount = retVal;
@@ -197,7 +141,7 @@ public abstract class HandlerExperiments
return retVal;
}
- public String getDuration(DuccId jobId, String millisV2, String millisV1) {
+ private String getDuration(DuccId jobId, String millisV2