fix data report, protein report

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

diff --git a/server/compbio/listeners/ProtServlet.java b/server/compbio/listeners/ServletSequenceProtein.java
similarity index 79%
rename from server/compbio/listeners/ProtServlet.java
rename to server/compbio/listeners/ServletSequenceProtein.java
index d567106..6a10b94 100644 (file)
--- a/server/compbio/listeners/ProtServlet.java
+++ b/server/compbio/listeners/ServletSequenceProtein.java
@@ -9,13 +9,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import compbio.statistic.CassandraRequester;
 import compbio.statistic.StatisticsProt;
 
 /**
  * Servlet implementation class ProtServlet
  */
-@WebServlet("/ProtServlet")
-public class ProtServlet extends HttpServlet {
+@WebServlet("/ServletSequenceProtein")
+public class ServletSequenceProtein extends HttpServlet {
        private static final long serialVersionUID = 1L;
 
        /**
@@ -28,14 +29,11 @@ public class ProtServlet extends HttpServlet {
                String prot = request.getParameter("prot");
                String search = request.getParameter("Search");
                int counter = Integer.parseInt(request.getParameter("counterJob"));
-               StatisticsProt sp = new StatisticsProt();
+               CassandraRequester cr = new CassandraRequester();
                if (search.equals("Search counter")) {
-                       request.setAttribute("result", sp.readProtID(counter));
+       //              request.setAttribute("result", sp.readProtID(counter));
                } else {
-                       if (flag.equals("whole"))
-                               request.setAttribute("result", sp.readProteins(prot));
-                       else
-                               request.setAttribute("result", sp.readPart(prot));
+                               request.setAttribute("result", cr.readProteins(prot, flag));
                }
                final long endTime = System.currentTimeMillis();
                request.setAttribute("timeExecution", (endTime - startTime));
@@ -43,7 +41,7 @@ public class ProtServlet extends HttpServlet {
                request.setAttribute("flag", flag);
                request.setAttribute("search", search);
                request.setAttribute("counter", counter);
-               RequestDispatcher rd = request.getRequestDispatcher("/ReportProt.jsp");
+               RequestDispatcher rd = request.getRequestDispatcher("/ReportSequenceProtein.jsp");
                rd.forward(request, response);
        }