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

diff --git a/server/compbio/controllers/SequenceController.java b/server/compbio/controllers/SequenceController.java
index b73a172..c57ed1f 100644
--- a/server/compbio/controllers/SequenceController.java
+++ b/server/compbio/controllers/SequenceController.java
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import compbio.cassandra.ProteinBean;
-import compbio.cassandra.DataBase;
+import compbio.cassandra.TotalByCounterBean;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -57,17 +57,32 @@ public class SequenceController {
 	}
 
 	@RequestMapping(value = "/sequence/querycounter", method = RequestMethod.GET)
-	public String countSequences(@RequestParam("counterJob") int counter, Map<String, Object> model) {
+	public String countSequences(@RequestParam("counterJob") String counter, Map<String, Object> model) {
 		final long startTime = System.currentTimeMillis();
 
-		if (counter < 1) {
+		if (counter.equals("")) {
+			model.put("error", "The value must not be empty");
+			model.put("value", counter);
+			return "queryIPStatistics";
+		}
+
+		int realcounter;
+		try {
+			realcounter = Integer.parseInt(counter.trim());
+		} catch (NumberFormatException e) {
+			model.put("error", "The value must be an integer number");
+			model.put("value", counter);
+			return "queryIPStatistics";
+		}
+
+		if (realcounter < 1) {
 			model.put("error", "The value must be greater than 0");
 			model.put("value", counter);
-			return "queryProteinSequenceCounter";
+			return "queryIPStatistics";
 		}
 
 		CassandraRequester cr = new CassandraRequester();
-		List<DataBase> r = cr.readProteinByCounter(counter);
+		List<TotalByCounterBean> r = cr.readProteinByCounter(realcounter);
 		model.put("results", r);
 		model.put("njobs", 0);
 		if (null != r) {
@@ -75,7 +90,7 @@ public class SequenceController {
 		}
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
-		model.put("counter", counter);
+		model.put("counter", realcounter);
 		return "reportProteinSequencesCounter";
 	}