goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

open the latest search by default

pull/42/head
Zlatin Balevsky 2020-03-19 22:03:40 +00:00
parent c6c1ac1d93
commit 68bc0bbf30
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webui/src/main/java/com/muwire/webui/SearchManager.java
View File

@ -30,13 +30,11 @@ class SearchManager {
this.core = core;
}
void newSearch(String search) {
UUID newSearch(String search) {
search = search.trim();
if (search.length() == 0)
return;
if (search.length() > 128) {
// TODO: browse by persona
} else {
return null;
else {
UUID uuid = UUID.randomUUID();
SearchResults searchResults = new SearchResults(uuid, search);
@ -84,6 +82,7 @@ class SearchManager {
queryEvent.setSig2(DataUtil.signUUID(uuid, timestamp, core.getSpk()));
core.getEventBus().publish(queryEvent);
return uuid;
}
}

7
webui/src/main/java/com/muwire/webui/SearchServlet.java
View File

@ -44,8 +44,11 @@ public class SearchServlet extends HttpServlet {
if (action.equals("start")) {
String search = req.getParameter("search");
searchManager.newSearch(search);
resp.sendRedirect("/MuWire/Home");
UUID newUUID = searchManager.newSearch(search);
if (newUUID != null)
resp.sendRedirect("/MuWire/Home?uuid=" + newUUID.toString());
else
resp.sendError(403, Util._t("Please enter a search keyword or hash"));
} else if (action.equals("stop")) {
String uuidString = req.getParameter("uuid");
UUID uuid = UUID.fromString(uuidString);

2
webui/src/main/js/search.js
View File

@ -845,7 +845,7 @@ function refreshStatus() {
if (uuid != null) {
var newStatus = statusByUUID.get(uuid)
if (newStatus.revision > currentSearch.revision)
if (currentSearch == null || newStatus.revision > currentSearch.revision)
refreshFunction(uuid)
}
}

5
webui/src/main/webapp/Home.jsp
View File

@ -31,6 +31,11 @@
<script src="js/tables.js?<%=version%>" type="text/javascript"></script>
<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
<script src="js/search.js?<%=version%>" type="text/javascript"></script>
<% if (request.getParameter("uuid") != null) {%>
<script>
uuid="<%=request.getParameter("uuid")%>"
</script>
<% } %>
</head>
<% if (groupBy.equals("sender")) { %>
<body onload="initTranslate(jsTranslations); initConnectionsCount(); initGroupBySender(); initCertificates();">