X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Flisteners%2FServletDeleteRecord.java;h=bd288fb435e08a89dd3ba2edbe5726c2e5b78fa5;hb=bf5e83e2959a3b88963cb9a8da68fc50ce4329af;hp=8ec6a1f327ac054046fdcf73c7799bfbf5f26226;hpb=d4eea7f5a8fea637ab742ce69c84a0f835266567;p=proteocache.git

diff --git a/server/compbio/listeners/ServletDeleteRecord.java b/server/compbio/listeners/ServletDeleteRecord.java
index 8ec6a1f..bd288fb 100644
--- a/server/compbio/listeners/ServletDeleteRecord.java
+++ b/server/compbio/listeners/ServletDeleteRecord.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import compbio.cassandra.CassandraRemover;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -20,17 +21,28 @@ public class ServletDeleteRecord extends HttpServlet {
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		CassandraRequester cr = new CassandraRequester();
+		CassandraRemover cr = new CassandraRemover();
+		int numberRemover = 0;
 		String flagId = request.getParameter("byId");
 		String jobId = request.getParameter("id");
+		String flagDate = request.getParameter("byDate");
 		String date1 = request.getParameter("date1");
 		String date2 = request.getParameter("date2");
-		if (flagId.equals("on"))
-			request.setAttribute("result", cr.countJobs(date1, date2));
-		System.out.println(flagId);
-//		request.setAttribute("IdJob", id);
-//		RequestDispatcher rd = request.getRequestDispatcher("/ReportLogInfo.jsp");
-//		rd.forward(request, response);
+		String flagIp = request.getParameter("byIp");
+		String ip = request.getParameter("ip");
+		String flagSeq = request.getParameter("bySequence");
+		String seq = request.getParameter("seq");
+		if (flagId != null)
+			numberRemover = cr.RemoveJobById(jobId);
+		if (flagDate != null) 
+			numberRemover = cr.RemoveJobByDate(date1, date2);
+		if (flagIp != null)
+			numberRemover = cr.RemoveJobByIp(ip);
+		if (flagSeq != null)
+			numberRemover = cr.RemoveJobBySequence(seq);
+		request.setAttribute("result", numberRemover);
+		RequestDispatcher rd = request.getRequestDispatcher("/ReportAboutRemove.jsp");
+		rd.forward(request, response);
 	}
 
 	/**