loveisgrief/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass sender's b64 and browse status from endpoint

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-12-08 11:35:30 +00:00
parent 3d967da110
commit 2b1d95e2ef
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,8 @@ public class SearchServlet extends HttpServlet {
sb.append("<Sender>");
sb.append(Util.escapeHTMLinXML(sender.getHumanReadableName()));
sb.append("</Sender>");
sb.append("<SenderB64>").append(sender.toBase64()).append("</SenderB64>");
sb.append("<Browse>").append(resultsFromSender.iterator().next().getBrowse()).append("</Browse>");
resultsFromSender.forEach(result -> {
sb.append("<Result>");
sb.append("<Name>");
@ -110,6 +112,8 @@ public class SearchServlet extends HttpServlet {
resultSet.forEach(result -> {
sb.append("<Result>");
sb.append("<Sender>").append(Util.escapeHTMLinXML(result.getSender().getHumanReadableName())).append("</Sender>");
sb.append("<SenderB64").append(result.getSender().toBase64()).append("</SenderB64>");
sb.append("<Browse>").append(result.getBrowse()).append("</Browse>");
if (result.getComment() != null) {
sb.append("<Comment>")
.append(Util.escapeHTMLinXML(result.getComment()))

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

@ -33,6 +33,8 @@ class SearchByFile {
class ResultsBySender {
constructor(xmlNode) {
this.sender = xmlNode.getElementsByTagName("Sender")[0].childNodes[0].nodeValue;
this.senderB64 = xmlNode.getElementsByTagName("SenderB64")[0].childNodes[0].nodeValue;
this.browse = xmlNode.getElementsByTagName("Browse")[0].childNodes[0].nodeValue;
this.results = new Map();
var resultNodes = xmlNode.getElementsByTagName("Result");
var i;
@ -75,6 +77,8 @@ class ResultBySender {
class ResultByFile {
constructor(xmlNode) {
this.sender = xmlNode.getElementsByTagName("Sender")[0].childNodes[0].nodeValue;
this.senderB64 = xmlNode.getElementsByTagName("SenderB64")[0].childNodes[0].nodeValue;
this.browse = xmlNode.getElementsByTagName("Browse")[0].childNodes[0].nodeValue;
this.comment = null;
var comment = xmlNode.getElementsByTagName("Comment")
if (comment.length == 1)