diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java index f3907cdd..1cde5277 100644 --- a/webui/src/main/java/com/muwire/webui/SearchServlet.java +++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java @@ -1,6 +1,8 @@ package com.muwire.webui; import java.io.IOException; +import java.util.Map; +import java.util.Set; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -8,9 +10,13 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.muwire.core.Persona; +import com.muwire.core.search.UIResultEvent; + public class SearchServlet extends HttpServlet { private SearchManager searchManager; + private ConnectionCounter connectionCounter; @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -18,10 +24,46 @@ public class SearchServlet extends HttpServlet { searchManager.newSearch(search); resp.sendRedirect("/MuWire/Home.jsp"); } + + + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + String section = req.getParameter("section"); + StringBuilder sb = new StringBuilder(); + sb.append(""); + if (section.equals("activeSearches")) { + sb.append(""); + for (SearchResults results : searchManager.getResults().values()) { + sb.append(""); + sb.append("").append(results.getUUID()).append(""); + sb.append("").append(results.getSearch()).append(""); + Map> bySender = results.getBySender(); + sb.append("").append(bySender.size()).append(""); + int total = 0; + for (Set s : bySender.values()) { + total += s.size(); + } + sb.append("").append(total).append(""); + sb.append(""); + } + sb.append(""); + } else if (section.equals("connectionsCount")) { + sb.append(""); + sb.append(connectionCounter.getConnections()); + sb.append(""); + } + resp.setContentType("text/xml"); + resp.getWriter().write(sb.toString()); + resp.flushBuffer(); + } + + @Override public void init(ServletConfig config) throws ServletException { searchManager = (SearchManager) config.getServletContext().getAttribute("searchManager"); + connectionCounter = (ConnectionCounter) config.getServletContext().getAttribute("connectionCounter"); } } diff --git a/webui/src/main/webapp/Home.jsp b/webui/src/main/webapp/Home.jsp index 03ecc5fe..03106d6c 100644 --- a/webui/src/main/webapp/Home.jsp +++ b/webui/src/main/webapp/Home.jsp @@ -1,38 +1,30 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ page import="java.io.*" %> + pageEncoding="UTF-8"%><%@ page import="java.io.*" %> <%@ page import="java.util.*" %> <%@ page import="com.muwire.webui.*" %> <%@ page import="com.muwire.core.*" %> <%@ page import="com.muwire.core.search.*" %> <%@ page import="net.i2p.data.*" %> - <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - <% MuWireClient client = (MuWireClient) application.getAttribute("mwClient"); - ConnectionCounter connectionCounter = (ConnectionCounter) client.getServletContext().getAttribute("connectionCounter"); - String persona = client.getCore().getMe().getHumanReadableName(); String version = client.getCore().getVersion(); - session.setAttribute("persona", persona); session.setAttribute("version", version); - %> - - MuWire ${version} - - - + + MuWire ${version} + +
Welcome to MuWire ${persona} - Connections <%= connectionCounter.getConnections() %> + Connections : 0
@@ -52,79 +44,79 @@
- <% - SearchManager searchManager = (SearchManager) client.getServletContext().getAttribute("searchManager"); - DownloadManager downloadManager = (DownloadManager) client.getServletContext().getAttribute("downloadManager"); - if (request.getParameter("uuid") == null) { - out.print("Active Searches
"); - for (SearchResults results : searchManager.getResults().values()) { - StringBuilder sb = new StringBuilder(); - sb.append(results.getSearch()); - sb.append(" senders: "); - Map> bySender = results.getBySender(); - sb.append(bySender.size()); - - int total = 0; - for (Set s : bySender.values()) { - total += s.size(); + + + + + + + + + +
+ Active Searches + + Results +
+
+ 		+
+
+ + + \ No newline at end of file