diff --git a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java index 55dfa155..c195933a 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java @@ -89,7 +89,9 @@ public class JobResource extends Resource { protected void writeHtml(Writer writer) { PrintWriter pw = new PrintWriter(writer); - String jobTitle = cj.getShortName()+ " - Job main page"; + String jobTitle = cj.getShortName() + " - " + + getJobStatusDescription() + + " - Job main page"; String baseRef = getRequest().getResourceRef().getBaseRef().toString(); if(!baseRef.endsWith("/")) { baseRef += "/"; @@ -207,17 +209,8 @@ public class JobResource extends Resource { } } pw.println(""); - - - if(!cj.isContainerOk()) { - pw.println("

Unbuilt Job

"); - } else if(cj.isRunning()) { - pw.println("

Active Job: "+cj.getCrawlController().getState()+"

"); - } else if(cj.isLaunchable()){ - pw.println("

Ready Job

"); - } else { - pw.println("

Finished Job: "+cj.getCrawlController().getCrawlExitStatus()+"

"); - } + + pw.println("

Job is "+getJobStatusDescription()+"

"); if(cj.isContainerOk()) { pw.println("Totals
  "); @@ -337,6 +330,18 @@ public class JobResource extends Resource { pw.println("
"); pw.close(); } + + public String getJobStatusDescription() { + if(!cj.isContainerOk()) { + return "Unbuilt"; + } else if(cj.isRunning()) { + return "Active: "+cj.getCrawlController().getState(); + } else if(cj.isLaunchable()){ + return "Ready"; + } else { + return "Finished: "+cj.getCrawlController().getCrawlExitStatus(); + } + } /** * Print a link to the given File