done time execution for queries, query by counter of job, total in column in query...

[proteocache.git] / server / compbio / listeners / QueryServlet.java

diff --git a/server/compbio/listeners/QueryServlet.java b/server/compbio/listeners/QueryServlet.java
index 1241b60..a69a18f 100644 (file)
--- a/server/compbio/listeners/QueryServlet.java
+++ b/server/compbio/listeners/QueryServlet.java
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import compbio.cassandra.*;
+import compbio.cassandra.DataBase;
 import compbio.statistic.StatisticsProt;
 
 @WebServlet("/QueryServlet")
@@ -23,23 +23,23 @@ public class QueryServlet extends HttpServlet {
         *      response)
         */
        protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-               List<DataBase> result;
-               String flag = request.getParameter("option");
+               final long startTime = System.currentTimeMillis();
                String date1 = request.getParameter("data1");
                String date2 = request.getParameter("data2");
                StatisticsProt sp = new StatisticsProt();
-               if (flag == null)
-                       result = sp.readDetail(date1, date2);
-               else {
+               if (null != request.getParameter("option")) {
                        Calendar cal = Calendar.getInstance();
-                       String dateB = StatisticsProt.DateFormatYYMMDD(sp.earliestDate());
-                       String dateEnd = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
-                       result = sp.readDetail(dateB, dateEnd);
+                       date1 = StatisticsProt.DateFormatYYMMDD(sp.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);
-               request.setAttribute("result", result);
-               request.setAttribute("flag", flag);
+               List<DataBase> res = sp.readDetails(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");
                rd.forward(request, response);
        }