--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/web/StatusListener.java	2011/12/22 14:45:38	1670
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/web/StatusListener.java	2012/03/13 17:41:56	1732
@@ -13,19 +13,31 @@
 
 import org.bukkit.configuration.Configuration;
 
-import org.kokakiwi.apicraft.events.ApiEvent;
-import org.kokakiwi.apicraft.events.ApiListener;
+/*import org.kokakiwi.apicraft.events.ApiEvent;
+import org.kokakiwi.apicraft.events.ApiListener;*/
+import de.codeinfection.quickwango.ApiBukkit.ApiBukkit;
+import de.codeinfection.quickwango.ApiBukkit.ApiServer.*;
 
-public class StatusListener extends ApiListener {
+
+@Controller( name = "webstatus", authenticate = false, serializer = "plain" )
+public class StatusListener extends ApiController {
 
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 	Server server;
 	Configuration loginConfig;
+	Configuration homeConfig;
+
+	long cachedTime = 0;
+	String cachedXml = "";
+
+	public StatusListener(Plugin plugin, Server server, Configuration loginConfig, Configuration homeConfig) {
+		
+		super( new de.codeinfection.quickwango.Abstraction.Implementations.Bukkit.BukkitPlugin(plugin) );
 
-	public StatusListener(Server server, Configuration loginConfig) {
 		this.server = server;
 		this.loginConfig = loginConfig;		
+		this.homeConfig = homeConfig;
 	}
 
 	String formatTime(String input) {
@@ -37,10 +49,33 @@
 	}
 	
 	@Override
-	public void onApiEvent(ApiEvent event) {
-		if(!event.path[0].equalsIgnoreCase("webstatus")) {
+	public void defaultAction(String action, ApiRequest request, ApiResponse response) {
+/*		if(!event.path[0].equalsIgnoreCase("webstatus")) {
 			return;
+		}*/
+
+		String xml;
+
+		synchronized(this) { //is this necessary ?
+			long now = System.currentTimeMillis();
+			if ( (now-cachedTime) > 5000) {
+				xml = buildXML();
+				cachedXml = xml;
+				cachedTime = now;
+			} else {
+				xml = cachedXml;
+			}
 		}
+			
+
+/*		event.setResponse(xml);
+		event.setActionTaken(true);*/
+
+		response.setContent( xml);
+	}
+	
+	private String buildXML() {
+
 		StringBuilder sb = new StringBuilder();
 
 		sb.append("<?xml version=\"1.0\"?> \n");
@@ -88,8 +123,18 @@
 				sb.append("<y>" + loc.getBlockY() + "</y>");
 				sb.append("<z>" + loc.getBlockZ() + "</z>");
 				sb.append("<world>" + loc.getWorld().getName() + "</world>");
-				sb.append("</location>");
-			
+				sb.append("</location>");			
+			}
+
+			String homeWorld = homeConfig.getString( player.getName() + ".world");
+			if (homeWorld != null) {
+				sb.append("<home>");
+				sb.append("<world>" + homeWorld + "</world>\n");
+				sb.append("<x>" + (int)homeConfig.getDouble(player.getName() + ".x") + "</x>\n");
+				sb.append("<y>" + (int)homeConfig.getDouble(player.getName() + ".y") + "</y>\n");
+				sb.append("<z>" + (int)homeConfig.getDouble(player.getName() + ".z") + "</z>\n");
+				sb.append("</home>");
+
 			}
 
 
@@ -109,8 +154,8 @@
 		sb.append("</plugins>\n");
 							
 		sb.append("</serverinfo>");			
-		event.setResponse(sb.toString());
-		event.setActionTaken(true);
+
+		return sb.toString();
 		
 	}