--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/09/27 19:14:39	348
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/07 13:37:37	410
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import com.gargoylesoftware.htmlunit.ProxyConfig;
+
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -19,6 +19,23 @@
 public class DepartureFetcher {
 	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
+	
+	TimeoutCache<Integer, List<DepartureBean>> cache = new TimeoutCache<Integer,List<DepartureBean>>(120 * 1000);
+	
+		
+	
+	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Exception {
+
+		List<DepartureBean> list = cache.get(stationID);
+		
+		if (list == null) {
+			list = lookupDepartures(stationID);
+			cache.put(stationID, list);
+		} else {
+			logger.info("Departure: Cache hit " + stationID); //remove before production
+		}
+		return list;
+	}
 		
 
 	public List<DepartureBean> lookupDepartures(int stationID) throws Exception {
@@ -63,7 +80,7 @@
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
 	    final WebClient webClient = new WebClient();
-	    webClient.setTimeout(1000);
+	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
 	    
@@ -82,12 +99,16 @@
 		    		DepartureBean departure = new DepartureBean();
 		    		
 		    		String time = fields.get(0).asText();
+		    		if (time.equals(""))
+		    			time = "0:00"; //Bane.dk bug work-around
 		    		departure.setTime(time);
 		    		
 		    		int updated = extractUpdated( fields.get(1) );
 		    		departure.setUpdated(updated);
 		    		
 		    		String trainNumber = fields.get(2).asText();
+		    		if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
+		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
 		    		String destination = fields.get(3).asText();
@@ -143,6 +164,25 @@
 		return note;
 	}
 	
+	private String extractTrainNumber(HtmlElement trainTd) {
+		String number = "";
+		HtmlElement anchorElement = trainTd.getElementsByTagName("a").get(0);
+		String href = anchorElement.getAttribute("href");
+		String argstring = href.substring( href.indexOf('?') + 1);
+		
+		String args[] = argstring.split("&");
+		for (String arg : args) {
+			String pair[] = arg.split("="); // Key=pair[0], Value=pair[1]
+			
+			if (pair[0].equalsIgnoreCase("TogNr"))
+				number = pair[1];
+		}
+		
+		
+		
+		return number;
+	}
+	
 	//test
 	public static void main(String args[]) throws Exception{
 		DepartureFetcher f = new DepartureFetcher();