Merge branch 'master' into servlets

Conflicts:
	WEB-INF/web.xml
	website/AllReports.jsp
	website/Index.jsp
	website/ReportSequenceProtein.jsp

diff --git a/server/compbio/listeners/ServletIp.java b/server/compbio/listeners/ServletIp.java
new file mode 100644 (file)
index 0000000..9fb5383
--- /dev/null
+++ b/server/compbio/listeners/ServletIp.java
@@ -0,0 +1,44 @@
+package compbio.listeners;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import compbio.cassandra.DataBase;
+import compbio.statistic.CassandraRequester;
+
+/**
+ * Servlet implementation class ServletIp
+ */
+public class ServletIp extends HttpServlet {
+       private static final long serialVersionUID = 1L;
+       
+       /**
+        * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+        */
+       protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+               final long startTime = System.currentTimeMillis();
+               String ip = request.getParameter("ip");
+               CassandraRequester cr = new CassandraRequester();
+               List<DataBase> r = cr.readIp(ip);
+               request.setAttribute("results", r);
+               final long endTime = System.currentTimeMillis();
+               request.setAttribute("timeExecution", (endTime - startTime));
+               request.setAttribute("ip", ip);
+               RequestDispatcher rd = request.getRequestDispatcher("/FullReportJobsByIp.jsp");
+               rd.forward(request, response);
+       }
+
+       /**
+        * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+        */
+       protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+               doGet(request, response);
+       }
+
+}

diff --git a/server/compbio/listeners/ServletJobsByIp.java b/server/compbio/listeners/ServletJobsByIp.java
new file mode 100644 (file)
index 0000000..f8d92b9
--- /dev/null
+++ b/server/compbio/listeners/ServletJobsByIp.java
@@ -0,0 +1,45 @@
+package compbio.listeners;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import compbio.cassandra.DataBase;
+import compbio.statistic.CassandraRequester;
+
+/**
+ * Servlet implementation class ServletJobsByIp
+ */
+public class ServletJobsByIp extends HttpServlet {
+       private static final long serialVersionUID = 1L;
+       
+
+       /**
+        * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+        */
+       protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+               final long startTime = System.currentTimeMillis();
+               int counter = Integer.parseInt(request.getParameter("counterIp"));
+               CassandraRequester cr = new CassandraRequester();
+               List<DataBase> r = cr.readIpByCounter(counter);
+               request.setAttribute("results", r);
+               final long endTime = System.currentTimeMillis();
+               request.setAttribute("timeExecution", (endTime - startTime));
+               request.setAttribute("counter", counter);
+               RequestDispatcher rd = request.getRequestDispatcher("/ReportJobsByIp.jsp");
+               rd.forward(request, response);
+       }
+
+       /**
+        * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+        */
+       protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+               doGet(request, response);
+       }
+
+}

diff --git a/server/compbio/listeners/ServletSequenceProtein.java b/server/compbio/listeners/ServletSequenceProtein.java
index ef7353f..84af1b8 100644 (file)
--- a/server/compbio/listeners/ServletSequenceProtein.java
+++ b/server/compbio/listeners/ServletSequenceProtein.java
@@ -35,11 +35,11 @@ public class ServletSequenceProtein extends HttpServlet {
                if (search.equals("Search counter")) {
                        List<DataBase> r = cr.readProteinByCounter(counter);
                        request.setAttribute("results", r);
-                       System.out.println ("Search counter: " + r.size() + " proteins found");
+       //              System.out.println ("Search counter: " + r.size() + " proteins found");
                } else {
                        List<DataBase> r = cr.readProteins(prot, flag);
                        request.setAttribute("results", r);
-                       System.out.println ("Search sequence: " + r.size() + " proteins found");
+               //      System.out.println ("Search sequence: " + r.size() + " proteins found");
                }
                final long endTime = System.currentTimeMillis();
                request.setAttribute("timeExecution", (endTime - startTime));