X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FJobController.java;h=9fdc128c9624fa5a77efcf4412a24c4b933507a3;hb=2d0c3af83988ff2a68d789efb4ccf2ff3c65a88a;hp=94045f96e130737bd5769928b7d3e57bdc2a6436;hpb=025c55d49c191f24d0e06c5cbb69a9894c50af22;p=proteocache.git diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java index 94045f9..9fdc128 100644 --- a/server/compbio/controllers/JobController.java +++ b/server/compbio/controllers/JobController.java @@ -1,26 +1,52 @@ package compbio.controllers; -import java.security.Principal; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import compbio.statistic.CassandraRequester; +import compbio.beans.ExecutionTimeBean; +import compbio.beans.Total; +import compbio.beans.TotalExecutionTime; +import compbio.beans.TotalJobsStatisticBean; import compbio.cassandra.DataBase; -import compbio.statistic.StatisticsProt; +import compbio.cassandra.DateFormatter; +import compbio.cassandra.readers.CassandraReader; +import compbio.cassandra.readers.ExecutionTimeReader; +import compbio.cassandra.readers.JobReader; +import compbio.engine.archive.ArchivedJob; /** * @author Alexander Sherstnev * @author Natasha Sherstneva + * @version 1.0 Dec 2013 */ @Controller public class JobController extends BasicController { + private static Logger log = Logger.getLogger(JobController.class); + /** + * form a query page for job execution time statistics. The servlet should + * be available for users and admins only. By defaults the report time range + * is from the earliest day with jobs to today ("Query for all dates" is + * ticked). If the user removes the tick the time range is from today - 3 + * days to today. Currently, the input model is empty. + * + * @param model + * MVC model + * @return link to the JSP query page + */ @RequestMapping(value = "/stat/exectime/query", method = RequestMethod.GET) public String initFormExecTime(Map model) { model.put("username", getPrincipalName()); @@ -34,46 +60,132 @@ public class JobController extends BasicController { return "query/JobTimeExecution"; } + /** + * form a query page for a job. The servlet should no be visible to users at + * all. + * + * @param model + * MVC model + * @return link to the JSP query page + */ @RequestMapping(value = "/job/query", method = RequestMethod.GET) public String initFindForm(Map model) { model.put("username", getPrincipalName()); - model.put("value", "jp_NzBOJKo"); + CassandraRequester cr = new CassandraRequester(); + model.put("value", cr.getExample("jobid")); return "query/JobLog"; } + /** + * form a report page for a job execution time statistics. + * + * @param model + * MVC model + * @return link to the JSP query page + */ @RequestMapping(value = "/stat/exectime/results", method = RequestMethod.GET) public String findExecTimeData(@RequestParam("date1") String date1, @RequestParam("date2") String date2, @RequestParam(value = "option", required = false) String option, Map model) { model.put("username", getPrincipalName()); final long startTime = System.currentTimeMillis(); - - CassandraRequester sp = new CassandraRequester(); + Calendar loccal = Calendar.getInstance(); + ExecutionTimeReader reader = new ExecutionTimeReader(); if (option.equals("AllDates,off")) { - Calendar cal = Calendar.getInstance(); - date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate()); - date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH); + date1 = theEaerlistDate; + date2 = theCurrentDate; + } + + // dates in string format + String trimmeddate1 = date1.replaceAll("\\s", ""); + String trimmeddate2 = date2.replaceAll("\\s", ""); + // dates in long format + long longDate1 = DateFormatter.DateParsing(date1, formaterYYMMDD); + long longDate2 = DateFormatter.DateParsing(date2, formaterYYMMDD); + String error = DateChecking(trimmeddate1, trimmeddate2, longDate1, longDate2); + if (error != null) { + model.put("error", error); + model.put("date1", date1); + model.put("date2", date2); + return "query/JobTimeExecution"; } + + if (longDate1 < CassandraReader.earliestDate()) + longDate1 = CassandraReader.earliestDate(); + if (longDate2 > loccal.getTimeInMillis()) + longDate2 = loccal.getTimeInMillis(); + + date1 = DateFormatter.DateLongToString(longDate1, formaterYYMMDD); + date2 = DateFormatter.DateLongToString(longDate2, formaterYYMMDD); model.put("date1", date1); model.put("date2", date2); model.put("option", option); - List res = sp.extractExecutionTime(date1, date2); + ExecutionTimeBean res = reader.query(longDate1, longDate2);; model.put("result", res); - model.put("ndays", res.size() - 1); + Map results = res.getDateTotal(); + String csvline = ""; + if (0 < res.getDateTotal().size()) { + csvline = "\'Date\',\'Total\',\'0-30 sec\',\'30-60 sec\',\'1-2 min\',\'2-10 min\',\'more 10 min\'%0A"; + for (Map.Entry entry : results.entrySet()) { + csvline += "\'" + entry.getKey() + "\',\'" + entry.getValue().getTotal() + "\',\'" + entry.getValue().getTotal0_30s() + "\',\'" + + entry.getValue().getTotal30_60s() + "\',\'" + entry.getValue().getTotal1_2m() + "\',\'" + + entry.getValue().getTotal2_10m() + "\',\'" + entry.getValue().getTotal10m() + "\'%0A"; + } + } + model.put("csvfile", csvline); + model.put("ndays", res.getDateTotal().size() - 1); final long endTime = System.currentTimeMillis(); model.put("timeExecution", (endTime - startTime)); - return "/reportTimeExecution"; + return "/reports/TimeExecution"; } + /** + * form a query page for a job. The servlet should no be visible to users at + * all. + * + * @param model + * MVC model + * @return link to the JSP query page + * @throws IOException + */ @RequestMapping(value = "/job/results", method = RequestMethod.GET) - public String findJob(@RequestParam("IdJob") String jobid, Map model) { + public String findJob(@RequestParam("IdJob") String jobid, Map model) throws IOException { model.put("username", getPrincipalName()); final long startTime = System.currentTimeMillis(); - CassandraRequester cr = new CassandraRequester(); - model.put("result", cr.readJobLog(jobid)); + JobReader reader = new JobReader(); + model.put("result", reader.readJobLog(jobid)); final long endTime = System.currentTimeMillis(); model.put("timeExecution", (endTime - startTime)); model.put("IdJob", jobid); - return "reportJobLog"; + + ArchivedJob aj = new ArchivedJob(jobid); + try { + model.put("jobarchive", aj.prepareJobArchiveToWeb()); + } catch (IOException e) { + 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); + HttpURLConnection httpConnection_remotelinkurl = (HttpURLConnection) remotelinkurl.openConnection(); + if (199 < httpConnection_remotelinkurl.getResponseCode() && httpConnection_remotelinkurl.getResponseCode() < 300) { + model.put("jobremotelink", remotelink); + } + return "reports/Job"; } - + + /** + * convert date from the standard long representation (milliseconds from 1 + * Jan 1970) to yyyy/mm/dd + * + * @param indate + * date in milliseconds from 1 Jan 1970 + * @return date in the form of yyyy/mm/dd + */ + private String DateFormatYYMMDD(long indate) { + SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd"); + String dateString = datformat.format(new Date(indate)); + return dateString; + } + }