--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/02 15:06:08	387
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/09 08:52:37	428
@@ -6,40 +6,41 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
-
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import dk.thoerup.curcuitbreaker.CircuitBreaker;
+import dk.thoerup.curcuitbreaker.CircuitBreakerManager;
 import dk.thoerup.traininfoservice.DBConnection;
 
 public class DepartureFetcher {
 	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
-	TimeoutCache<Integer, List<DepartureBean>> cache = new TimeoutCache<Integer,List<DepartureBean>>(120 * 1000);
+	Map<Integer, List<DepartureBean>> cache = new TimeoutMap<Integer,List<DepartureBean>>(120 * 1000);
 	
 		
 	
-	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Exception {
+	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Throwable {
 
 		List<DepartureBean> list = cache.get(stationID);
 		
 		if (list == null) {
-			logger.warning("Departure: Cache miss " + stationID); //remove before production
 			list = lookupDepartures(stationID);
 			cache.put(stationID, list);
 		} else {
-			logger.warning("Departure: Cache hit " + stationID); //remove before production
+			logger.info("Departure: Cache hit " + stationID); //remove before production
 		}
 		return list;
 	}
 		
 
-	public List<DepartureBean> lookupDepartures(int stationID) throws Exception {
+	public List<DepartureBean> lookupDepartures(int stationID) throws Throwable {
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
 		Connection conn = null;
@@ -76,7 +77,7 @@
 		return departureList;
 	}
 	
-	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Exception {
+	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Throwable {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
@@ -84,8 +85,11 @@
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
+	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
-	    final HtmlPage page = webClient.getPage("http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode);
+	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
 	    
 	    HtmlElement table = page.getElementById("afgangtabel");
 	    
@@ -108,7 +112,7 @@
 		    		departure.setUpdated(updated);
 		    		
 		    		String trainNumber = fields.get(2).asText();
-		    		if (trainNumber.trim().length() == 1)
+		    		if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
 		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
@@ -185,7 +189,7 @@
 	}
 	
 	//test
-	public static void main(String args[]) throws Exception{
+	public static void main(String args[]) throws Throwable {
 		DepartureFetcher f = new DepartureFetcher();
 		List<DepartureBean> deps = f.lookupDepartures("AR", "FJRN");
 		for(DepartureBean d : deps) {