Add posibility to look at failed jobs

[proteocache.git] / server / compbio / controllers / DailyStatisticsController.java

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 0fdd4b8..142a298 100644 (file)
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -4,7 +4,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Controller;
@@ -12,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import compbio.cassandra.DataBase;
+import compbio.engine.JobStatus;
 import compbio.cassandra.DateBean;
 import compbio.cassandra.TotalJobsStatisticBean;
 import compbio.statistic.CassandraRequester;
@@ -61,7 +60,8 @@ public class DailyStatisticsController {
        }
 
        @RequestMapping(value = "/stat/oneday", method = RequestMethod.GET)
-       public String findJobsInOneDay(@RequestParam("date") String date, Map<String, Object> model) throws ParseException {
+       public String findJobsInOneDay(@RequestParam("date") String date, @RequestParam("status") String status, Map<String, Object> model) throws ParseException {
+
                final long startTime = System.currentTimeMillis();
 
                String realdate;
@@ -78,13 +78,18 @@ public class DailyStatisticsController {
                        realdate = date;
                }
 
+               if (null == JobStatus.getJobStatus(status)) {
+                       return "support/Notimplemented";
+               }
+
                CassandraRequester cr = new CassandraRequester();
                // IMPORTANT: input should be suppied in the format: DD/MM/YYYY
-               DateBean r = cr.readJobByDay(realdate);
+               DateBean r = cr.readJobByDay(realdate, JobStatus.getJobStatus(status));
                model.put("results", r);
                if (r != null)
                        model.put("njobs", r.getJobidAndSeq().size());
                model.put("date", realdate);
+               model.put("status", status);
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                return "/reportJobStatisticsOneDay";