--- android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2011/04/19 16:46:39	1313
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2011/07/01 13:37:24	1542
@@ -26,7 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.thoerup.traininfoservice.banedk.TimeoutMap;
+import dk.thoerup.genericjavautils.TimeoutMap;
 
 @WebServlet(urlPatterns={"/RequestPlotter"})
 public class RequestPlotter extends HttpServlet {
@@ -58,7 +58,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/");
 		
@@ -78,7 +78,7 @@
 			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);	
@@ -267,8 +267,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" );			
 		}		
@@ -324,10 +325,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" );
@@ -385,6 +386,8 @@
 		
 		if (count > 30) //limit to 30 days
 			count = 30;
+		if (count < 0) //negative count is not allowed
+			count = 0;
 		
 		String kmlData = getRequestsFromFile(count);
 		
@@ -401,12 +404,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);
 		}
 	}
 }