X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;fp=server%2Fcompbio%2Fcontrollers%2FDailyStatisticsController.java;h=14535238055fcd0f542fc7ff59cacd897fc23e66;hb=5637d461a2a42327d160f4de7b29ca6e6e1f32ab;hp=5d183f977bd82ea3d365115259be69875ecf8962;hpb=7de49cca0d2c7525f698001533e0b48193715413;p=proteocache.git

diff --git a/server/compbio/controllers/DailyStatisticsController.java b/server/compbio/controllers/DailyStatisticsController.java
index 5d183f9..1453523 100644
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@ -20,9 +20,13 @@ import compbio.cassandra.readers.CassandraReader;
 import compbio.cassandra.readers.DailyStatisticsReader;
 
 /**
+ * MVC controller for collecting and showing job statistics
+ * 
  * @author Alexander Sherstnev
  * @author Natasha Sherstneva
- * @version 1.0 Dec 2013
+ * 
+ * @version 1.0
+ * @since Dec 2013
  */
 @Controller
 public class DailyStatisticsController extends BasicController {
@@ -76,8 +80,8 @@ public class DailyStatisticsController extends BasicController {
 		final long startTime = System.currentTimeMillis();
 		DailyStatisticsReader reader = new DailyStatisticsReader();
 		if (option.equals("AllDates,off")) {
-			date1 = theEaerlistDate;
-			date2 = theCurrentDate;
+			date1 = getEarliestDate();
+			date2 = getCurrentDate();
 		}
 
 		// dates in string format
@@ -86,7 +90,7 @@ public class DailyStatisticsController extends BasicController {
 		// dates in long format
 		long longDate1 = DateFormatter.DateParsing(date1, formaterYYMMDD);
 		long longDate2 = DateFormatter.DateParsing(date2, formaterYYMMDD);
-		String error = DateChecking(trimmeddate1, trimmeddate2, longDate1, longDate2);
+		String error = checkDates(trimmeddate1, trimmeddate2, longDate1, longDate2);
 		if (error != null) {
 			model.put("error", error);
 			model.put("date1", date1);
@@ -151,10 +155,9 @@ public class DailyStatisticsController extends BasicController {
 			thetime = formaterDDMMYY.parse(realdate).getTime();
 		}
 
-		if (null == JobStatus.getJobStatus(status)) 
+		if (null == JobStatus.getJobStatus(status))
 			return "support/Notimplemented";
 
-
 		DailyStatisticsReader reader = new DailyStatisticsReader();
 		// IMPORTANT: input should be suppied in the format: DD/MM/YYYY
 		DateBean r = reader.readJobByDay(thetime, realdate, JobStatus.getJobStatus(status));