From 78a8704ab93d673e648e4c9f62a7719167c215d1 Mon Sep 17 00:00:00 2001 From: Pascal Koenig Date: Sun, 25 Sep 2011 05:30:05 +0200 Subject: [PATCH] added basic server information to each output and fixed minor bug that prevented error messages on wrong parameters. --- .../XmlStats/XmlWorkers/XmlWorker.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorker.java b/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorker.java index d2d1ac5..28a9f51 100644 --- a/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorker.java +++ b/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorker.java @@ -45,6 +45,7 @@ import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpExchange; import de.sockenklaus.XmlStats.XmlStats; +import de.sockenklaus.XmlStats.XmlStatsRegistry; import de.sockenklaus.XmlStats.Datasource.Datasource; import de.sockenklaus.XmlStats.Exceptions.UserNotFoundException; @@ -102,6 +103,14 @@ public abstract class XmlWorker implements HttpHandler { List userList; 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 { parameters = parseParameters(queryString); @@ -114,11 +123,7 @@ public abstract class XmlWorker implements HttpHandler { * Actually create the XML */ - if(parameters.isEmpty()){ - root.appendChild(getXml(parameters)); - } - - else if(parameters.containsKey("user")){ + if(parameters.containsKey("user")){ if (parameters.get("user").contains("*")){ userList = Datasource.fetchAllPlayers(); } @@ -139,6 +144,9 @@ public abstract class XmlWorker implements HttpHandler { root.appendChild(getSumXml(userList, parameters)); } + if (!parameters.containsKey("sum") && !parameters.containsKey("user")){ + root.appendChild(getXml(parameters)); + } /* * Build string from XML */