--- android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2011/04/19 16:31:11	1311
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2011/07/08 14:56:01	1560
@@ -17,7 +17,6 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -27,7 +26,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.thoerup.traininfoservice.banedk.TimeoutMap;
+import dk.thoerup.genericjavautils.HttpUtil;
+import dk.thoerup.genericjavautils.TimeoutMap;
 
 @WebServlet(urlPatterns={"/RequestPlotter"})
 public class RequestPlotter extends HttpServlet {
@@ -59,7 +59,7 @@
 		return fileStr.substring(fileStr.length() - 3).equals(".gz");
 	}
 	
-	protected File[] getFiles(int count) {
+	public static File[] getFiles(int count) {
 		File accessLogDir = new File("/home/app/domain1/logs/access/");
 		//File accessLogDir = new File("/home/torben/inst/glassfishv3/glassfish/domains/domain1/logs/access/");
 		
@@ -79,24 +79,16 @@
 			return empty;
 		}
 		
-		int from = logFiles.length - (count);
+		int from = (count>logFiles.length) ? 0 : logFiles.length - (count);
 		int to = logFiles.length;
 				
 		return Arrays.copyOfRange(logFiles, from, to);	
 	}
 	
-	protected PositionContainer getRequestsFromFileWorker(boolean multiple) throws IOException{
+	protected PositionContainer getRequestsFromFileWorker(int  count) throws IOException{
 		PositionContainer positions = new PositionContainer();
 
-		try {
-			
-			int count;
-			
-			if (multiple == false) {
-				count = 1;
-			} else {
-				count = 4;
-			}
+		try {			
 			
 			File files[] = getFiles(count);
 
@@ -131,6 +123,8 @@
 						continue;
 					}
 					
+					
+					
 					RequestPosition pos = new RequestPosition();
 	
 					String toks[] = line.split(" ");
@@ -138,12 +132,10 @@
 	
 					pos.time = df.parse( toks[2].replace("\"", "") );
 	
-					String argpart = toks[5].split("\\?")[1];
+					Map<String,String> params = HttpUtil.decodeUri( toks[5] );					
 	
-					String args[] = argpart.split("&");
-	
-					pos.lat = args[0].split("=")[1];
-					pos.lng = args[1].split("=")[1];
+					pos.lat = params.get("latitude");
+					pos.lng = params.get("longitude");
 					
 					
 					long timediff = now.getTime() - pos.time.getTime();					
@@ -276,8 +268,9 @@
 		for(RequestPosition current : list) {
 			String id = color + count++; 
 			sb.append( " <Placemark id=\"" + id + "\">\n" );
+			sb.append( "  <name>").append(current.time).append("</name>\n" );
 			sb.append( "  <styleUrl>#").append(color).append("</styleUrl>\n" );
-			sb.append( "  <description><![CDATA[IP=").append(current.ip).append("<br/>Time=").append(current.time).append("]]></description>\n" );
+			sb.append( "  <description><![CDATA[IP=").append(current.ip).append("<br/> ]]></description>\n" );
 			sb.append( "  <Point><coordinates>").append(current.lng).append(",").append(current.lat).append(",0</coordinates></Point>\n" );
 			sb.append( " </Placemark>\n" );			
 		}		
@@ -333,10 +326,10 @@
 	*/	
 		
 
-		formatPositions(sb, "blue", positions.blue);
-		formatPositions(sb, "green", positions.green);
-		formatPositions(sb, "yellow", positions.yellow);
 		formatPositions(sb, "red", positions.red);
+		formatPositions(sb, "yellow", positions.yellow);
+		formatPositions(sb, "green", positions.green);
+		formatPositions(sb, "blue", positions.blue);
 		
 
 		sb.append( "</Document>\n" );
@@ -345,20 +338,16 @@
 		return sb.toString(); 
 	}
 	
-	protected String getRequestsFromFile(boolean multiple) throws IOException {		
+	protected String getRequestsFromFile(int count) throws IOException {		
 		String kmlData = null;
 		String key;
 		
-		if (multiple == false)  {
-			key = "kmldata";
-		} else {
-			key = "kmldata-multi";
-		}
+		key = "kmldata-" + count;
 					
-		kmlData = null;// = cache.get(key);
+		kmlData = cache.get(key);
 			
 		if (kmlData == null) {
-			kmlData = formatXml( getRequestsFromFileWorker(multiple) );
+			kmlData = formatXml( getRequestsFromFileWorker(count) );
 			cache.put(key, kmlData);
 			kmlData += "<!-- from source -->";			
 		} else {
@@ -381,12 +370,27 @@
 		return (p != 0);
 	}
 
+	int getCount(String param) {
+		if (param == null || param.equals("")) {
+			return 1;
+		}
+				
+		return Integer.parseInt(param);
+	}
+
+	
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		
-		boolean multiple = enabled( req.getParameter("multi") );
 		
-		String kmlData = getRequestsFromFile(multiple);
+		int count = getCount( req.getParameter("count") );
+		
+		if (count > 30) //limit to 30 days
+			count = 30;
+		if (count < 0) //negative count is not allowed
+			count = 0;
+		
+		String kmlData = getRequestsFromFile(count);
 		
 		if ( enabled(req.getParameter("zip")) ) {
 
@@ -401,12 +405,16 @@
 			byte bytes[] = baos.toByteArray();
 
 			resp.setContentType(KMZ);
-			resp.setContentLength( bytes.length );
+			resp.setHeader("Content-Disposition", "attachment; filename=Traininfo-requestplotter.kmz");
+			resp.setContentLength( bytes.length );			
 			resp.getOutputStream().write(bytes);
 
 		} else {
-			resp.setContentType(KML);
-			resp.getWriter().print( kmlData );
+			byte bytes[] = kmlData.getBytes();
+			
+			resp.setContentType(KML);			
+			resp.setContentLength( bytes.length );
+			resp.getOutputStream().write(bytes);
 		}
 	}
 }