X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FJobExecutionTimeController.java;h=191a40c49701088ab7f04ef51c0396893eec0df1;hb=4a5237c1930f267a2e9f7a9d735f1a556c9f018b;hp=0917bde69de29c066fbb9c96a02d604f7ea1cb12;hpb=ca0ed055669c0c5d81689e52da5325578a221888;p=proteocache.git

diff --git a/server/compbio/controllers/JobExecutionTimeController.java b/server/compbio/controllers/JobExecutionTimeController.java
index 0917bde..191a40c 100644
--- a/server/compbio/controllers/JobExecutionTimeController.java
+++ b/server/compbio/controllers/JobExecutionTimeController.java
@@ -20,24 +20,31 @@ 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);
 		}
-		model.put("data1", date1);
-		model.put("data2", date2);
+		model.put("date1", date1);
+		model.put("date2", date2);
+		model.put("option", option);
 		model.put("result", sp.extractExecutionTime(date1, date2));
-		model.put("flag", option);
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
 		return "/reportTimeExecution";