Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets

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

diff --git a/server/compbio/controllers/JobExecutionTimeController.java b/server/compbio/controllers/JobExecutionTimeController.java
index 0917bde..a5e9b63 100644 (file)
--- a/server/compbio/controllers/JobExecutionTimeController.java
+++ b/server/compbio/controllers/JobExecutionTimeController.java
@@ -1,6 +1,7 @@
 package compbio.controllers;
 
 import java.util.Calendar;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Controller;
@@ -8,8 +9,8 @@ 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.statistic.StatisticsProt;
 
 /**
  * @author Alexander Sherstnev
@@ -20,24 +21,33 @@ public class JobExecutionTimeController {
 
        @RequestMapping(value = "/exectime", method = RequestMethod.GET)
        public String initFindForm(Map<String, Object> model) {
+               Calendar cal = Calendar.getInstance();
+               String date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE);
+               cal.add(Calendar.DATE, -3);
+               String date1 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DATE);
+
+               model.put("date1", date1);
+               model.put("date2", date2);
                return "queryTimeExecution";
        }
 
        @RequestMapping(value = "/exectime/query", method = RequestMethod.GET)
-       public String findSequence(@RequestParam("data1") String date1, @RequestParam("data2") String date2,
+       public String findSequence(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
                        @RequestParam(value="option", required=false) String option, Map<String, Object> model) {
                final long startTime = System.currentTimeMillis();
 
                CassandraRequester sp = new CassandraRequester();
-               if (option.equals("AllDates")) {
+               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 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate());
+//                     date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
                }
-               model.put("data1", date1);
-               model.put("data2", date2);
-               model.put("result", sp.extractExecutionTime(date1, date2));
-               model.put("flag", option);
+               model.put("date1", date1);
+               model.put("date2", date2);
+               model.put("option", option);
+//             List<DataBase> res = sp.extractExecutionTime(date1, date2);
+//             model.put("result", res);
+//             model.put("ndays", res.size() - 1);
                final long endTime = System.currentTimeMillis();
                model.put("timeExecution", (endTime - startTime));
                return "/reportTimeExecution";