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/06/01 15:25:29 UTC
svn commit: r1488527 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java webapp/root/js/ducc.js
Author: degenaro
Date: Sat Jun 1 13:25:29 2013
New Revision: 1488527
URL: http://svn.apache.org/r1488527
Log:
UIMA-2949 DUCC webserver (WS) javascript performance improvements & UIMA-2959 jd.err.log listed more than once!
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/webapp/root/js/ducc.js
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=1488527&r1=1488526&r2=1488527&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 Sat Jun 1 13:25:29 2013
@@ -494,33 +494,39 @@ public class DuccHandler extends DuccAbs
isp0 = "<span class=\"health_black\">";
}
}
- List<IUimaPipelineAEComponent> upcList = jp.getUimaPipelineComponents();
- if(upcList != null) {
- if(!upcList.isEmpty()) {
- String id = ""+process.getDuccId().getFriendly();
- initTime = "<a class=\"classLoad\" title=\""+id+"\" href=\"#loadme"+id+"\" rel=\"#loadme"+id+"\">"+initTime+"</a>";
- loadme.append("<div id=\"loadme"+id+"\">");
- loadme.append("<table>");
- loadme.append("<tr>");
- String ch1 = "Name";
- String ch2 = "State";
- String ch3 = "Time";
- loadme.append("<td>"+"<b>"+ch1+"</b>");
- loadme.append("<td>"+"<b>"+ch2+"</b>");
- loadme.append("<td>"+"<b>"+ch3+"</b>");
- Iterator<IUimaPipelineAEComponent> upcIterator = upcList.iterator();
- while(upcIterator.hasNext()) {
- IUimaPipelineAEComponent upc = upcIterator.next();
- String iName = upc.getAeName();
- String iState = upc.getAeState().toString();
- String iTime = FormatHelper.duration(upc.getInitializationTime());
+ boolean cluetips_disabled = true;
+ if(cluetips_disabled) {
+ loadme.append(initTime);
+ }
+ else {
+ List<IUimaPipelineAEComponent> upcList = jp.getUimaPipelineComponents();
+ if(upcList != null) {
+ if(!upcList.isEmpty()) {
+ String id = ""+process.getDuccId().getFriendly();
+ initTime = "<a class=\"classLoad\" title=\""+id+"\" href=\"#loadme"+id+"\" rel=\"#loadme"+id+"\">"+initTime+"</a>";
+ loadme.append("<div id=\"loadme"+id+"\">");
+ loadme.append("<table>");
loadme.append("<tr>");
- loadme.append("<td>"+iName);
- loadme.append("<td>"+iState);
- loadme.append("<td>"+iTime);
+ String ch1 = "Name";
+ String ch2 = "State";
+ String ch3 = "Time";
+ loadme.append("<td>"+"<b>"+ch1+"</b>");
+ loadme.append("<td>"+"<b>"+ch2+"</b>");
+ loadme.append("<td>"+"<b>"+ch3+"</b>");
+ Iterator<IUimaPipelineAEComponent> upcIterator = upcList.iterator();
+ while(upcIterator.hasNext()) {
+ IUimaPipelineAEComponent upc = upcIterator.next();
+ String iName = upc.getAeName();
+ String iState = upc.getAeState().toString();
+ String iTime = FormatHelper.duration(upc.getInitializationTime());
+ loadme.append("<tr>");
+ loadme.append("<td>"+iName);
+ loadme.append("<td>"+iState);
+ loadme.append("<td>"+iTime);
+ }
+ loadme.append("</table>");
+ loadme.append("</div>");
}
- loadme.append("</table>");
- loadme.append("</div>");
}
}
}
@@ -816,21 +822,23 @@ public class DuccHandler extends DuccAbs
sb.append("</tr>");
}
// jd.err.log
- if(fileExists(logsjobdir+errfile)) {
- String href2 = "<a href=\""+duccLogData+"?"+"fname="+logsjobdir+errfile+"\" onclick=\"var newWin = window.open(this.href,'child','height=800,width=1200,scrollbars'); newWin.focus(); return false;\">"+errfile+"</a>";
- sb.append(tr);
- // Id
- sb.append("<td>");
- sb.append("</td>");
- // Err Log
- sb.append("<td>");
- sb.append(href2);
- sb.append("</td>");
- // Err Log Size (in MB)
- sb.append("<td align=\"right\">");
- sb.append(getFileSize(logsjobdir+errfile));
- sb.append("</td>");
- sb.append("</tr>");
+ if(type.equals("JD")) {
+ if(fileExists(logsjobdir+errfile)) {
+ String href2 = "<a href=\""+duccLogData+"?"+"fname="+logsjobdir+errfile+"\" onclick=\"var newWin = window.open(this.href,'child','height=800,width=1200,scrollbars'); newWin.focus(); return false;\">"+errfile+"</a>";
+ sb.append(tr);
+ // Id
+ sb.append("<td>");
+ sb.append("</td>");
+ // Err Log
+ sb.append("<td>");
+ sb.append(href2);
+ sb.append("</td>");
+ // Err Log Size (in MB)
+ sb.append("<td align=\"right\">");
+ sb.append(getFileSize(logsjobdir+errfile));
+ sb.append("</td>");
+ sb.append("</tr>");
+ }
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1488527&r1=1488526&r2=1488527&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Sat Jun 1 13:25:29 2013
@@ -25,7 +25,12 @@ var display_table_style;
var ms_reload_min = 5000;
+var cluetips_disabled = true;
+
function ducc_cluetips() {
+ if(cluetips_disabled) {
+ return;
+ }
try {
$('a.logfileLink').cluetip('destroy');
$('a.logfileLink').cluetip({
@@ -1474,10 +1479,10 @@ function ducc_init(type)
ducc_init_job_performance_data();
ducc_init_job_specification_data();
ducc_load_job_workitems_count_data();
- ducc_load_job_specification_data();
+ ducc_load_job_processes_data();
ducc_load_job_workitems_data();
ducc_load_job_performance_data();
- ducc_load_job_processes_data();
+ ducc_load_job_specification_data();
}
if(type == "reservation-details") {
ducc_init_reservation_processes_data();
@@ -1906,11 +1911,11 @@ function ducc_update_page(type)
ducc_load_reservations_data();
}
if(type == "job-details") {
- //ducc_load_job_specification_data();
- ducc_load_job_performance_data();
- ducc_load_job_workitems_data();
- ducc_load_job_processes_data();
ducc_load_job_workitems_count_data();
+ ducc_load_job_processes_data();
+ ducc_load_job_workitems_data();
+ ducc_load_job_performance_data();
+ //ducc_load_job_specification_data();
}
if(type == "reservation-details") {
//ducc_load_reservation_specification_data();