import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.text.ParseException;
import java.util.Calendar;
+import java.util.Date;
import java.util.Map;
import org.apache.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import compbio.statistic.CassandraRequester;
+import compbio.beans.DateBean;
import compbio.beans.ExecutionTimeBean;
+import compbio.beans.JobBean;
import compbio.beans.TotalExecutionTime;
import compbio.cassandra.DateFormatter;
import compbio.cassandra.readers.CassandraReader;
import compbio.cassandra.readers.ExecutionTimeReader;
import compbio.cassandra.readers.JobReader;
+import compbio.engine.ExecutionInterval;
import compbio.engine.archive.ArchivedJob;
/**
@RequestMapping(value = "/job/query", method = RequestMethod.GET)
public String initFindForm(Map<String, Object> model) {
model.put("username", getPrincipalName());
- CassandraRequester cr = new CassandraRequester();
+ CassandraReader cr = new CassandraReader();
model.put("value", cr.getExample("jobid"));
return "query/JobLog";
}
Calendar loccal = Calendar.getInstance();
ExecutionTimeReader reader = new ExecutionTimeReader();
if (alldates.equals("AllDates,off")) {
- date1 = theEaerlistDate;
- date2 = theCurrentDate;
+ date1 = getEarliestDate();
+ date2 = getCurrentDate();
}
// dates in string format
// dates in long format
long longDate1 = DateFormatter.DateParsing(date1, formaterYYMMDD);
long longDate2 = DateFormatter.DateParsing(date2, formaterYYMMDD);
- String error = DateChecking(trimmeddate1, trimmeddate2, longDate1, longDate2);
+ String error = checkDates(trimmeddate1, trimmeddate2, longDate1, longDate2);
if (error != null) {
model.put("error", error);
model.put("date1", date1);
model.put("timeExecution", (endTime - startTime));
return "/reports/TimeExecution";
}
+
+ /**
+ * form a report page for job statistics for one day only.
+ *
+ * @param model
+ * MVC model object
+ * @param date
+ * date for the report
+ * @param status
+ *
+ * @return link to the report JSP page
+ */
+ @RequestMapping(value = "/stat/jobsoneday/executionTime", method = RequestMethod.GET)
+ public String findJobsInOneDay(@RequestParam("date") String date, @RequestParam("interval") String interval, Map<String, Object> model)
+ throws ParseException {
+ model.put("username", getPrincipalName());
+ final long startTime = System.currentTimeMillis();
+
+ String realdate;
+ long thetime = 0;
+ try {
+ thetime = formaterYYMMDD.parse(date).getTime();
+ if (thetime < 0) {
+ realdate = date;
+ } else {
+ realdate = formaterDDMMYY.format(new Date(thetime));
+ }
+ } catch (ParseException e) {
+ realdate = date;
+ thetime = formaterDDMMYY.parse(realdate).getTime();
+ }
+
+ if (null == ExecutionInterval.getExecutionInterval(interval))
+ return "support/Notimplemented";
+
+ ExecutionTimeReader reader = new ExecutionTimeReader();
+ // IMPORTANT: input should be suppied in the format: DD/MM/YYYY
+ DateBean r = reader.readJobByDay(thetime, realdate, ExecutionInterval.getBoundsInterval(interval));
+ model.put("results", r);
+ if (r != null)
+ model.put("njobs", r.getJobidAndSeq().size());
+ model.put("date", realdate);
+ model.put("status", interval);
+ final long endTime = System.currentTimeMillis();
+ model.put("timeExecution", (endTime - startTime));
+ return "reports/JobStatisticsOneDay";
+ }
/**
* form result page for one job with a given job ID.
model.put("username", getPrincipalName());
final long startTime = System.currentTimeMillis();
JobReader reader = new JobReader();
- model.put("result", reader.readJobLog(jobid));
+ JobBean job = reader.readJobLog(jobid);
+ if (null == job) {
+ model.put("jobnotfound", "yes");
+ } else {
+ model.put("result", job);
+ }
final long endTime = System.currentTimeMillis();
model.put("timeExecution", (endTime - startTime));
model.put("IdJob", jobid);
log.error("JobController.prepareJobArchiveToWeb: IO exception with job archive file");
log.error(e.getLocalizedMessage(), e.getCause());
}
+
// add a direct link to the job
String remotelink = "http://www.compbio.dundee.ac.uk/www-jpred/results/" + jobid + "/" + jobid + ".results.html";
URL remotelinkurl = new URL(remotelink);