X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;h=9cdf874f632bd7860aa09d9a3385544d789140d6;hb=32cb93e5d1032189360155cbeedd45adadebfd46;hp=a9b51f112e1253ee6f070f7603ad775d3fa85565;hpb=8256bed38c0abeefe003adf6d9f126113f9cc5b3;p=proteocache.git

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index a9b51f1..9cdf874 100644
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -11,12 +11,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import compbio.engine.JobStatus;
-import compbio.cassandra.CassandraReader;
-import compbio.cassandra.DateBean;
+import compbio.beans.DateBean;
+import compbio.beans.TotalJobsStatisticBean;
 import compbio.cassandra.DateFormatter;
-import compbio.cassandra.Total;
-import compbio.cassandra.TotalJobsStatisticBean;
-import compbio.statistic.CassandraRequester;
+
+import compbio.beans.Total;
+import compbio.cassandra.readers.CassandraReader;
+import compbio.cassandra.readers.DailyStatisticsReader;
 
 /**
  * @author Alexander Sherstnev
@@ -71,7 +72,7 @@ public class DailyStatisticsController extends BasicController {
 		model.put("username", getPrincipalName());
 		Calendar loccal = Calendar.getInstance();
 		final long startTime = System.currentTimeMillis();
-		CassandraRequester cr = new CassandraRequester();
+		DailyStatisticsReader reader = new DailyStatisticsReader();
 		if (option.equals("AllDates,off")) {
 			date1 = theEaerlistDate;
 			date2 = theCurrentDate;
@@ -100,7 +101,7 @@ public class DailyStatisticsController extends BasicController {
 		date2 = DateFormatter.DateLongToString(longDate2, formaterYYMMDD);
 		model.put("date1", date1);
 		model.put("date2", date2);
-		TotalJobsStatisticBean res = cr.countJobs(date1, date2);
+		TotalJobsStatisticBean res = reader.query(longDate1, longDate2);
 		model.put("result", res);
 		Map<String, Total> results = res.getDateTotal();
 		String csvline = "\'Date\',\'Total\',\'OK\',\'Stopped\',\'Error\',\'Timeout\'%0A";
@@ -114,7 +115,7 @@ public class DailyStatisticsController extends BasicController {
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
 		model.put("option", option);
-		return "/reportJobStatistics";
+		return "reports/JobStatistics";
 	}
 
 	/**
@@ -135,8 +136,9 @@ public class DailyStatisticsController extends BasicController {
 		final long startTime = System.currentTimeMillis();
 
 		String realdate;
+		long thetime = 0;
 		try {
-			long thetime = formaterYYMMDD.parse(date).getTime();
+			thetime = formaterYYMMDD.parse(date).getTime();
 			if (thetime < 0) {
 				realdate = date;
 			} else {
@@ -144,15 +146,16 @@ public class DailyStatisticsController extends BasicController {
 			}
 		} catch (ParseException e) {
 			realdate = date;
+			thetime = formaterDDMMYY.parse(realdate).getTime();
 		}
 
 		if (null == JobStatus.getJobStatus(status)) {
 			return "support/Notimplemented";
 		}
 
-		CassandraRequester cr = new CassandraRequester();
+		DailyStatisticsReader reader = new DailyStatisticsReader();
 		// IMPORTANT: input should be suppied in the format: DD/MM/YYYY
-		DateBean r = cr.readJobByDay(realdate, JobStatus.getJobStatus(status));
+		DateBean r = reader.readJobByDay(thetime, realdate, JobStatus.getJobStatus(status));
 		model.put("results", r);
 		if (r != null)
 			model.put("njobs", r.getJobidAndSeq().size());
@@ -160,6 +163,6 @@ public class DailyStatisticsController extends BasicController {
 		model.put("status", status);
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
-		return "/reportJobStatisticsOneDay";
+		return "reports/JobStatisticsOneDay";
 	}
 }