X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;h=9cdf874f632bd7860aa09d9a3385544d789140d6;hb=c3f8a850072ca2c9b947e6d6fcd2cedd20fe1b73;hp=75ab67aa93a0d5f4cd4b519a2f04ef723f50deef;hpb=e8b88c0c8e432f8bc1aefdbd81df81e9ef706242;p=proteocache.git

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 75ab67a..9cdf874 100644
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -14,9 +14,10 @@ import compbio.engine.JobStatus;
 import compbio.beans.DateBean;
 import compbio.beans.TotalJobsStatisticBean;
 import compbio.cassandra.DateFormatter;
+
+import compbio.beans.Total;
 import compbio.cassandra.readers.CassandraReader;
 import compbio.cassandra.readers.DailyStatisticsReader;
-import compbio.cassandra.readers.ProteoDAO;
 
 /**
  * @author Alexander Sherstnev
@@ -61,8 +62,8 @@ public class DailyStatisticsController extends BasicController {
 	 *            the final date for the report (if option is set, date2 =
 	 *            today)
 	 * @param option
-	 *            defined whether the whole time range of jobs is reported
-	 *            (null means date1 and date2 are used)
+	 *            defined whether the whole time range of jobs is reported (null
+	 *            means date1 and date2 are used)
 	 * @return link to the report JSP page
 	 */
 	@RequestMapping(value = "/stat/jobsdaily/results", method = RequestMethod.GET)
@@ -102,11 +103,19 @@ public class DailyStatisticsController extends BasicController {
 		model.put("date2", 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";
+		for (Map.Entry<String, Total> entry : results.entrySet()) {
+			csvline += "\'" + entry.getKey() + "\',\'" + entry.getValue().getTotal() + "\',\'" + entry.getValue().getTotalOK() + "\',\'"
+					+ entry.getValue().getTotalStopped() + "\',\'" + entry.getValue().getTotalError() + "\',\'"
+					+ entry.getValue().getTotalTimeOut() + "\'%0A";
+		}
+		model.put("csvfile", csvline);
 		model.put("ndays", res.getDateTotal().size());
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
 		model.put("option", option);
-		return "/reportJobStatistics";
+		return "reports/JobStatistics";
 	}
 
 	/**
@@ -139,7 +148,7 @@ public class DailyStatisticsController extends BasicController {
 			realdate = date;
 			thetime = formaterDDMMYY.parse(realdate).getTime();
 		}
-		
+
 		if (null == JobStatus.getJobStatus(status)) {
 			return "support/Notimplemented";
 		}
@@ -154,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";
 	}
 }