From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 5 Dec 2013 09:20:42 +0000 (+0000)
Subject: Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c7b32cc1f17ec534d5b98ed27cc2f3a4b52daad6;p=proteocache.git

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

Conflicts:
	server/compbio/controllers/SequenceController.java
---

c7b32cc1f17ec534d5b98ed27cc2f3a4b52daad6
diff --cc server/compbio/controllers/DailyStatisticsController.java
index c9df6be,b735107..5731b96
--- a/server/compbio/controllers/DailyStatisticsController.java
+++ b/server/compbio/controllers/DailyStatisticsController.java
@@@ -50,9 -51,8 +51,9 @@@ public class DailyStatisticsController 
  		}
  		model.put("date1", date1);
  		model.put("date2", date2);
- 		List<DataBase> res = cr.countJobs(date1, date2);
+ 		TotalJobsStatisticBean res = cr.countJobs(date1, date2);
  		model.put("result", res);
 +		model.put("ndays", res.size());
  		final long endTime = System.currentTimeMillis();
  		model.put("timeExecution", (endTime - startTime));
  		model.put("option", option);
diff --cc server/compbio/controllers/SequenceController.java
index 0f154d3,2008a06..62ec81e
--- a/server/compbio/controllers/SequenceController.java
+++ b/server/compbio/controllers/SequenceController.java
@@@ -11,7 -10,7 +11,8 @@@ import org.springframework.web.bind.ann
  
  import compbio.cassandra.ProteinBean;
  import compbio.cassandra.DataBase;
 +import compbio.data.sequence.SequenceUtil;
+ import compbio.cassandra.TotalByCounterBean;
  import compbio.statistic.CassandraRequester;
  
  /**