--- android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2010/06/08 08:31:26	808
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2010/06/09 14:17:17	809
@@ -2,8 +2,10 @@
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -13,6 +15,7 @@
 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;
 
@@ -41,40 +44,73 @@
 	}
 
 
+	boolean isGz(String fileStr) {
+		return fileStr.substring(fileStr.length() - 3).equals(".gz");
+	}
 
-	protected List<RequestPosition> getRequestsFromFile() throws IOException{
+	protected List<RequestPosition> getRequestsFromFileWorker(boolean multiple) throws IOException{
 		List<RequestPosition> positions = new ArrayList<RequestPosition>();
 
 		try {
-			FileInputStream fis = new FileInputStream("/var/log/apache2/app_access.log");
-			BufferedReader in = new BufferedReader( new InputStreamReader(fis) );
+			String files_single[] = {"/var/log/apache2/app_access.log"};
+			String files_multi[] = {"/var/log/apache2/app_access.log.2.gz", "/var/log/apache2/app_access.log.1", "/var/log/apache2/app_access.log"};
+			
+			String files[];
+			
+			if (multiple == false) {
+				files = files_single;
+			} else {
+				files = files_multi;
+			}
 
 			SimpleDateFormat df = new SimpleDateFormat("dd/MMM/yyyy:HH:mm:ss");
-
-			String line;
-			while ( (line=in.readLine()) != null) {
-				if (line.indexOf("LocateStation") == -1 ){
+			
+			for (String fileStr : files ) {
+				File f = new File(fileStr);
+				if ( !f.exists() ) {
 					continue;
 				}
-
-				if (line.indexOf("latitude") == -1 ) {
-					continue;
+				
+				FileInputStream fis = new FileInputStream(fileStr);
+				
+				InputStream input;
+				if ( isGz(fileStr)) {
+					input = new GZIPInputStream(fis);
+				} else {
+					input = fis;
 				}
-				RequestPosition pos = new RequestPosition();
-
-				String toks[] = line.split(" ");
-				pos.ip = toks[0];
-
-				pos.time = df.parse( toks[3].replace("[", "") );
-
-				String argpart = toks[6].split("\\?")[1];
-
-				String args[] = argpart.split("&");
-
-				pos.lat = args[0].split("=")[1];
-				pos.lng = args[1].split("=")[1];
+				
+				BufferedReader in = new BufferedReader( new InputStreamReader(input) );
 
-				positions.add(pos);
+	
+				String line;
+				while ( (line=in.readLine()) != null) {
+					if (line.indexOf("LocateStation") == -1 ){
+						continue;
+					}
+	
+					if (line.indexOf("latitude") == -1 ) {
+						continue;
+					}
+					RequestPosition pos = new RequestPosition();
+	
+					String toks[] = line.split(" ");
+					pos.ip = toks[0];
+	
+					pos.time = df.parse( toks[3].replace("[", "") );
+	
+					String argpart = toks[6].split("\\?")[1];
+	
+					String args[] = argpart.split("&");
+	
+					pos.lat = args[0].split("=")[1];
+					pos.lng = args[1].split("=")[1];
+	
+					positions.add(pos);
+				}
+				in.close();
+				input.close();
+				fis.close();
 			}
 		} catch (ParseException pe) {
 			log.log(Level.SEVERE, "parseException", pe);
@@ -167,23 +203,37 @@
 
 		return sb.toString(); 
 	}
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		final String KEY = "kmldata";
-		
-		String kmlData = cache.get(KEY);
+	
+	protected String getRequestsFromFile(boolean multiple) throws IOException {		
+		String kmlData = null;
+		String key;
 		
+		if (multiple == false)  {
+			key = "kmldata";
+		} else {
+			key = "kmldata-multi";
+		}
+					
+		kmlData = cache.get(key);
+			
 		if (kmlData == null) {
-			kmlData = formatXml( getRequestsFromFile() );
-			cache.put(KEY, kmlData);
+			kmlData = formatXml( getRequestsFromFileWorker(multiple) );
+			cache.put(key, kmlData);
 			kmlData += "<!-- from source -->";			
 		} else {
 			kmlData += "<!-- cached -->";
 		}
+					
+		return kmlData;
+	}
 
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		
+		boolean multiple = req.getParameter("multi") != null;
+		
+		String kmlData = getRequestsFromFile(multiple);
 		
-
 		if (req.getParameter("zip") != null) {
 
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();