X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FDatabaseController.java;fp=server%2Fcompbio%2Fcontrollers%2FDatabaseController.java;h=c7d6155eb3f41f74a08da0777d5173328e234a45;hb=b672f3acd99e9475bd3603e3661ba6d604be0c2b;hp=e720a2c683f7ac9e00822d507ff57e1c9bab05fe;hpb=75431c815ea42cf3ffa18f485721146636575265;p=proteocache.git

diff --git a/server/compbio/controllers/DatabaseController.java b/server/compbio/controllers/DatabaseController.java
index e720a2c..c7d6155 100644
--- a/server/compbio/controllers/DatabaseController.java
+++ b/server/compbio/controllers/DatabaseController.java
@@ -12,8 +12,13 @@ import compbio.cassandra.CassandraRemover;
 import compbio.cassandra.DateFormatter;
 
 /**
+ * MVC controller for direct interaction with the internal DB
+ * 
  * @author Alexander Sherstnev
  * @author Natasha Sherstneva
+ * 
+ * @version 1.0
+ * @since Nov 2013
  */
 @Controller
 public class DatabaseController extends BasicController {
@@ -63,21 +68,27 @@ public class DatabaseController extends BasicController {
 		model.put("seq", sequence);
 
 		CassandraRemover cr = new CassandraRemover();
-		int njobs = 0;
+		int njobs1 = 0;
+		int njobs2 = 0;
+		int njobs3 = 0;
+		int njobs4 = 0;
 		if (byId.equals("on,off"))
-			njobs = cr.RemoveJobById(jobid);
+			njobs1 = cr.RemoveJobById(jobid);
 		if (byDate.equals("on,off")) {
 			long longDate1 = DateFormatter.DateParsing(date1, formaterYYMMDD) / 1000;
 			long longDate2 = DateFormatter.DateParsing(date2, formaterYYMMDD) / 1000;
 			int timerange = (int)(longDate2 - longDate1) /24 / 3600 + 1;
 			model.put("ndays", timerange);
-			njobs = cr.RemoveJobByDate(date1, date2);
+			njobs2 = cr.RemoveJobByDate(date1, date2);
 		}
 		if (byIp.equals("on,off"))
-			njobs = cr.RemoveJobByIp(ip);
+			njobs3 = cr.RemoveJobByIp(ip);
 		if (bySequence.equals("on,off"))
-			njobs = cr.RemoveJobBySequence(sequence);
-		model.put("njobs", njobs);
+			njobs4 = cr.RemoveJobBySequence(sequence);
+		model.put("njobs", njobs1 + njobs2 + njobs3 + njobs4);
+		model.put("njobsbyDate", njobs2);
+		model.put("njobsbyIP", njobs3);
+		model.put("njobsbySeq", njobs4);
 
 		return "reports/RemoveJobs";
 	}