X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FSequenceController.java;h=c57ed1f55d6208bafd5593ba328314d27b345ddc;hb=027e5ff55587cf7e8295066f9e43d56c180354f6;hp=8e5bc293d1b47d20a47c627a20ad0575f53f7f1a;hpb=f67950b14ab016e93cca92d9b918a255728d58fd;p=proteocache.git

diff --git a/server/compbio/controllers/SequenceController.java b/server/compbio/controllers/SequenceController.java
index 8e5bc29..c57ed1f 100644
--- a/server/compbio/controllers/SequenceController.java
+++ b/server/compbio/controllers/SequenceController.java
@@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import compbio.cassandra.DataBase;
-
+import compbio.cassandra.ProteinBean;
+import compbio.cassandra.TotalByCounterBean;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -42,11 +42,13 @@ public class SequenceController {
 
 		if (0 < trimmedsequence.length()) {
 			CassandraRequester cr = new CassandraRequester();
-			List<DataBase> r = cr.readProteins(trimmedsequence, flag);
+			List<ProteinBean> r = cr.readProteins(trimmedsequence, flag);
 			model.put("results", r);
 			if (null != r) {
-				System.out.println("result size = " + r.size());
-				model.put("njobs", r.size());
+				if (flag.equals("whole"))
+					model.put("njobs",r.get(0).getJobid().size());
+				else
+					model.put("njobs", r.size());
 			}
 		}
 		final long endTime = System.currentTimeMillis();
@@ -80,7 +82,7 @@ public class SequenceController {
 		}
 
 		CassandraRequester cr = new CassandraRequester();
-		List<DataBase> r = cr.readProteinByCounter(realcounter);
+		List<TotalByCounterBean> r = cr.readProteinByCounter(realcounter);
 		model.put("results", r);
 		model.put("njobs", 0);
 		if (null != r) {