X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Flisteners%2FServletJobsByDate.java;fp=server%2Fcompbio%2Flisteners%2FQueryServlet.java;h=4aee8bec119e339ecff14c3bdb65524aceb6e94d;hb=e371943c7ba7e4d2efe3c11bca6ed9ad1a94632b;hp=a69a18f71100e5e94694d3417791c3d8bd83703c;hpb=6097c3a4b7510ced14696c7ec98981b0cd0cea01;p=proteocache.git

diff --git a/server/compbio/listeners/QueryServlet.java b/server/compbio/listeners/ServletJobsByDate.java
similarity index 81%
rename from server/compbio/listeners/QueryServlet.java
rename to server/compbio/listeners/ServletJobsByDate.java
index a69a18f..4aee8be 100644
--- a/server/compbio/listeners/QueryServlet.java
+++ b/server/compbio/listeners/ServletJobsByDate.java
@@ -12,10 +12,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import compbio.cassandra.DataBase;
+import compbio.statistic.CassandraRequester;
 import compbio.statistic.StatisticsProt;
 
-@WebServlet("/QueryServlet")
-public class QueryServlet extends HttpServlet {
+@WebServlet("/ServletJobsByDate")
+public class ServletJobsByDate extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -26,21 +27,21 @@ public class QueryServlet extends HttpServlet {
 		final long startTime = System.currentTimeMillis();
 		String date1 = request.getParameter("data1");
 		String date2 = request.getParameter("data2");
-		StatisticsProt sp = new StatisticsProt();
+		CassandraRequester cr = new CassandraRequester();
 		if (null != request.getParameter("option")) {
 			Calendar cal = Calendar.getInstance();
-			date1 = StatisticsProt.DateFormatYYMMDD(sp.earliestDate());
+			date1 = StatisticsProt.DateFormatYYMMDD(cr.earliestDate());
 			date2 = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
 		}
 		request.setAttribute("data1", date1);
 		request.setAttribute("data2", date2);
-		List<DataBase> res = sp.readDetails(date1, date2);
+		List<DataBase> res = cr.countJobs(date1, date2);
 		request.setAttribute("result", res);
 		final long endTime = System.currentTimeMillis();
 		request.setAttribute("timeExecution", (endTime - startTime));
 		System.out.println ("QueryServlet.doGet: total number of dates = " + res.size());
 		request.setAttribute("flag", request.getParameter("option"));
-		RequestDispatcher rd = request.getRequestDispatcher("/ReportNew.jsp");
+		RequestDispatcher rd = request.getRequestDispatcher("/ReportJobsByDate.jsp");
 		rd.forward(request, response);
 	}