socrates/XmlStats
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

added basic server information to each output and fixed minor bug that

Browse Source 
prevented error messages on wrong parameters.
This commit is contained in:
Pascal Koenig
2011-09-25 05:30:05 +02:00
parent 48fea3f1a5
commit 78a8704ab9
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorker.java
View File

@@ -45,6 +45,7 @@ import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import de.sockenklaus.XmlStats.XmlStats; import de.sockenklaus.XmlStats.XmlStats;
import de.sockenklaus.XmlStats.XmlStatsRegistry;
import de.sockenklaus.XmlStats.Datasource.Datasource; import de.sockenklaus.XmlStats.Datasource.Datasource;
import de.sockenklaus.XmlStats.Exceptions.UserNotFoundException; import de.sockenklaus.XmlStats.Exceptions.UserNotFoundException;
@@ -102,6 +103,14 @@ public abstract class XmlWorker implements HttpHandler {
List<String> userList; List<String> userList;
this.doc.appendChild(root); this.doc.appendChild(root);
XmlStats xmlstats = (XmlStats)XmlStatsRegistry.get("xmlstats");
Element server = this.doc.createElement("server");
server.appendChild(getTextElem("version", xmlstats.getServer().getVersion()));
server.appendChild(getTextElem("name", xmlstats.getServer().getServerName()));
server.appendChild(getTextElem("ip", xmlstats.getServer().getIp()));
root.appendChild(server);
try { try {
parameters = parseParameters(queryString); parameters = parseParameters(queryString);
@@ -114,11 +123,7 @@ public abstract class XmlWorker implements HttpHandler {
* Actually create the XML * Actually create the XML
*/ */
if(parameters.isEmpty()){ if(parameters.containsKey("user")){
root.appendChild(getXml(parameters));
}
else if(parameters.containsKey("user")){
if (parameters.get("user").contains("*")){ if (parameters.get("user").contains("*")){
userList = Datasource.fetchAllPlayers(); userList = Datasource.fetchAllPlayers();
} }
@@ -139,6 +144,9 @@ public abstract class XmlWorker implements HttpHandler {
root.appendChild(getSumXml(userList, parameters)); root.appendChild(getSumXml(userList, parameters));
} }
if (!parameters.containsKey("sum") && !parameters.containsKey("user")){
root.appendChild(getXml(parameters));
}
/* /*
* Build string from XML * Build string from XML
*/ */