Skip to content

Commit

Permalink
NAS-2642: Further refactoring by making a new method generateJobInfor…
Browse files Browse the repository at this point in the history 
…mation
  • Loading branch information
Knud Åge Hansen committed Jun 26, 2017
1 parent c18f2fb commit 7dd06f0
Showing 1 changed file with 37 additions and 86 deletions.
123 changes: 37 additions & 86 deletions ...arvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/JobResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public class JobResource implements ResourceAbstract {

private static final String NAS_GROOVY_RESOURCE_PATH = "dk/netarkivet/harvester/webinterface/servlet/nas.groovy";

private static final String NAS_JOB = "Details and Actions on Running Job";

private static final String NAS_CRAWLLOG = " crawllog";

private static final String NAS_FRONTIER = " Frontier";
Expand Down Expand Up @@ -165,15 +167,8 @@ public void job(HttpServletRequest req, HttpServletResponse resp, List<Integer>
}

h3Job.update();

menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");

generateJobInformation(menuSb, h3Job);

sb.append("<div>\n");

Expand Down Expand Up @@ -217,19 +212,19 @@ public void job(HttpServletRequest req, HttpServletResponse resp, List<Integer>
sb.append("MaxJobRunningTime: ");
sb.append(h3Job.job.getMaxJobRunningTime());
sb.append(" ms.<br />\n");

sb.append("</div>\n");

/* Heritrix3 WebUI */
sb.append("<div style=\"float:left;position: absolute;left:600px;\">\n");
sb.append("<a href=\"");
sb.append(h3Job.hostUrl);
sb.append("\" class=\"btn btn-default\">");
sb.append("Heritrix3 WebUI");
sb.append("</a>");

sb.append("</div>\n");

sb.append("<div style=\"clear:both;\"></div>");
sb.append("</div>");

Expand Down Expand Up @@ -258,7 +253,7 @@ public void job(HttpServletRequest req, HttpServletResponse resp, List<Integer>
sb.append("\" class=\"btn btn-default\">");
sb.append("H3 Crawllog");
sb.append("</a>");

sb.append("&nbsp;");

/* Crawllog */
Expand Down Expand Up @@ -286,12 +281,12 @@ public void job(HttpServletRequest req, HttpServletResponse resp, List<Integer>
sb.append("&nbsp;");

sb.append("</div>\n");

/* line 2 */

sb.append("<h4>Queue actions</h4>\n");
sb.append("<div>\n");

/* Show/delete Frontier */
sb.append("<a href=\"");
sb.append(NASEnvironment.servicePath);
Expand Down Expand Up @@ -381,7 +376,7 @@ public void job(HttpServletRequest req, HttpServletResponse resp, List<Integer>
sb.append("\" class=\"btn btn-default\">");
sb.append("View scripting_events.log");
sb.append("</a>");

sb.append("</div>\n");

sb.append("shortName: ");
Expand Down Expand Up @@ -589,30 +584,15 @@ public void job(HttpServletRequest req, HttpServletResponse resp, List<Integer>
sb.append(" is not running.");
}

String pageName = NAS_JOB + h3Job.jobId;
generatePageInformation(numerics, locale, masterTplBuilder, sb, menuSb, pageName);

if (masterTplBuilder.titlePlace != null) {
masterTplBuilder.titlePlace.setText("Details and Actions on Running Job "+h3Job.jobId);
}
if (masterTplBuilder.menuPlace != null) {
masterTplBuilder.menuPlace.setText(menuSb.toString());
}
if (masterTplBuilder.languagesPlace != null) {
masterTplBuilder.languagesPlace.setText(environment.generateLanguageLinks(locale));
}
if (masterTplBuilder.headingPlace != null) {
masterTplBuilder.headingPlace.setText("Details and Actions on Running Job "+h3Job.jobId);
}
if (masterTplBuilder.contentPlace != null) {
masterTplBuilder.contentPlace.setText(sb.toString());
}
if (masterTplBuilder.versionPlace != null) {
masterTplBuilder.versionPlace.setText(Constants.getVersionString(true));
}
if (masterTplBuilder.environmentPlace != null) {
masterTplBuilder.environmentPlace.setText(Settings.get(CommonSettings.ENVIRONMENT_NAME));
}
if (masterTplBuilder.refreshInterval != null) {
masterTplBuilder.refreshInterval.setText("<meta http-equiv=\"refresh\" content=\""+Settings.get(HarvesterSettings.HARVEST_MONITOR_REFRESH_INTERVAL)+"\"/>\n");
}

masterTplBuilder.write(out);

Expand Down Expand Up @@ -670,14 +650,7 @@ public void crawllog_list(HttpServletRequest req, HttpServletResponse resp, List
Pageable pageable = h3Job;

if (h3Job != null && h3Job.isReady()) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
generateJobInformation(menuSb, h3Job);

String actionStr = req.getParameter("action");

Expand Down Expand Up @@ -719,7 +692,7 @@ public void crawllog_list(HttpServletRequest req, HttpServletResponse resp, List
sb.append(totalCachedSize);
sb.append(" bytes\n");
sb.append("</div>\n");

sb.append("<div style=\"float:left;\">\n");
sb.append("<a href=\"");
sb.append("?action=update");
Expand All @@ -728,7 +701,7 @@ public void crawllog_list(HttpServletRequest req, HttpServletResponse resp, List
sb.append("</a>");
//sb.append("the cache manually ");
sb.append("</div>\n");

sb.append("<div style=\"clear:both;\"></div>\n");
sb.append("</div>\n");

Expand Down Expand Up @@ -847,14 +820,7 @@ public void frontier_list(HttpServletRequest req, HttpServletResponse resp, List
Heritrix3JobMonitor h3Job = environment.h3JobMonitorThread.getRunningH3Job(numerics.get(0));

if (h3Job != null && h3Job.isReady()) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
generateJobInformation(menuSb, h3Job);

if (deleteStr != null && "1".equals(deleteStr) && (initials == null || initials.length() == 0)) {
//sb.append("<span style=\"text-color: red;\">Initials required to delete from the frontier queue!</span><br />\n");
Expand Down Expand Up @@ -904,6 +870,17 @@ public void frontier_list(HttpServletRequest req, HttpServletResponse resp, List
out.close();
}

private void generateJobInformation(StringBuilder menuSb, Heritrix3JobMonitor h3Job) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
}

public void filter_add(HttpServletRequest req, HttpServletResponse resp, List<Integer> numerics) throws IOException {
Locale locale = resp.getLocale();
resp.setContentType("text/html; charset=UTF-8");
Expand Down Expand Up @@ -964,14 +941,7 @@ public void filter_add(HttpServletRequest req, HttpServletResponse resp, List<In
Heritrix3JobMonitor h3Job = environment.h3JobMonitorThread.getRunningH3Job(numerics.get(0));

if (h3Job != null && h3Job.isReady()) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
generateJobInformation(menuSb, h3Job);

/* form control */
/* case submit for delete but no checked regex */
Expand Down Expand Up @@ -1119,14 +1089,7 @@ public void budget_change(HttpServletRequest req, HttpServletResponse resp, List
Heritrix3JobMonitor h3Job = environment.h3JobMonitorThread.getRunningH3Job(numerics.get(0));

if (h3Job != null && h3Job.isReady()) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
generateJobInformation(menuSb, h3Job);

/* form control */
boolean submitWithInitials = true;
Expand Down Expand Up @@ -1238,14 +1201,7 @@ public void script(HttpServletRequest req, HttpServletResponse resp, List<Intege
Heritrix3JobMonitor h3Job = environment.h3JobMonitorThread.getRunningH3Job(numerics.get(0));

if (h3Job != null && h3Job.isReady()) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
generateJobInformation(menuSb, h3Job);

if (engineStr != null && engineStr.length() > 0 && scriptStr != null && scriptStr.length() > 0) {
ScriptResult scriptResult = h3Job.h3wrapper.ExecuteShellScriptInJob(h3Job.jobResult.job.shortName, engineStr, scriptStr);
Expand Down Expand Up @@ -1318,14 +1274,7 @@ public void report(HttpServletRequest req, HttpServletResponse resp, List<Intege
Job job;

if (h3Job != null && h3Job.isReady()) {
menuSb.append("<tr><td>&nbsp; &nbsp; &nbsp; <a href=\"");
menuSb.append(NASEnvironment.servicePath);
menuSb.append("job/");
menuSb.append(h3Job.jobId);
menuSb.append("/");
menuSb.append("\"> Job ");
menuSb.append(h3Job.jobId);
menuSb.append("</a></td></tr>");
generateJobInformation(menuSb, h3Job);

if (h3Job.jobResult != null && h3Job.jobResult.job != null) {
job = h3Job.jobResult.job;
Expand Down Expand Up @@ -1403,6 +1352,8 @@ private void generatePageInformation(List<Integer> numerics, Locale locale, Mast
masterTplBuilder.refreshInterval.setText("<meta http-equiv=\"refresh\" content=\""+Settings.get(
HarvesterSettings.HARVEST_MONITOR_REFRESH_INTERVAL)+"\"/>\n");
}


}

}

0 comments on commit 7dd06f0

Please sign in to comment.