From: Natasha Sherstneva <n.shertneva@gmail.com>
Date: Thu, 5 Dec 2013 10:22:53 +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=6e4bd47e22036a7f0c7b66fe7ee4f188a7cffddb;p=proteocache.git

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

Conflicts:
	server/compbio/controllers/JobExecutionTimeController.java
	server/compbio/controllers/SequenceController.java
	server/compbio/statistic/CassandraRequester.java
---

6e4bd47e22036a7f0c7b66fe7ee4f188a7cffddb
diff --cc server/compbio/controllers/JobExecutionTimeController.java
index 13c606d,6170078..a5e9b63
--- a/server/compbio/controllers/JobExecutionTimeController.java
+++ b/server/compbio/controllers/JobExecutionTimeController.java
@@@ -8,8 -9,10 +9,8 @@@ import org.springframework.web.bind.ann
  import org.springframework.web.bind.annotation.RequestMethod;
  import org.springframework.web.bind.annotation.RequestParam;
  
- import compbio.statistic.CassandraRequester;
  
+ import compbio.statistic.CassandraRequester;
 -import compbio.cassandra.DataBase;
 -import compbio.statistic.StatisticsProt;
  
  /**
   * @author Alexander Sherstnev
@@@ -44,7 -47,9 +45,9 @@@ public class JobExecutionTimeControlle
  		model.put("date1", date1);
  		model.put("date2", date2);
  		model.put("option", option);
- 	//	model.put("result", sp.extractExecutionTime(date1, date2));
 -		List<DataBase> res = sp.extractExecutionTime(date1, date2);
 -		model.put("result", res);
 -		model.put("ndays", res.size() - 1);
++//		List<DataBase> res = sp.extractExecutionTime(date1, date2);
++//		model.put("result", res);
++//		model.put("ndays", res.size() - 1);
  		final long endTime = System.currentTimeMillis();
  		model.put("timeExecution", (endTime - startTime));
  		return "/reportTimeExecution";
diff --cc server/compbio/controllers/SequenceController.java
index c57ed1f,4bb9271..a5b1757
--- a/server/compbio/controllers/SequenceController.java
+++ b/server/compbio/controllers/SequenceController.java
@@@ -9,6 -10,8 +10,7 @@@ import org.springframework.web.bind.ann
  import org.springframework.web.bind.annotation.RequestParam;
  
  import compbio.cassandra.ProteinBean;
 -import compbio.cassandra.DataBase;
+ import compbio.data.sequence.SequenceUtil;
  import compbio.cassandra.TotalByCounterBean;
  import compbio.statistic.CassandraRequester;
  
diff --cc server/compbio/statistic/CassandraRequester.java
index 5de5066,5ed9398..6a54800
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@@ -113,10 -115,10 +113,11 @@@ public class CassandraRequester 
  		db.setTimeTotalExec(totalTime);
  		query.add(db);
  		return query;
 -	}
 -
++<<<<<<< HEAD
 +	}*/
 +	
  	/*
- 	 * query: total number of jobs  for the period from date1 till date2
+ 	 * query: total number of jobs for the period from date1 till date2
  	 */
  	public TotalJobsStatisticBean countJobs(String date1, String date2) {
  		if (null == date1) {