--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/09/29 15:49:19	353
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/08 12:19:42	421
@@ -7,8 +7,15 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import com.gargoylesoftware.htmlunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.RefreshHandler;
+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;
 
 public class TimetableFetcher {
 	
@@ -17,24 +24,44 @@
 		}
 		
 	}
+		
+	TimeoutCache<String, List<TimetableBean>> cache = new TimeoutCache<String,List<TimetableBean>>(120 * 1000);
+	
 	
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
+	
+	
+	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Throwable {
+		String key = trainID+type;
+		List<TimetableBean> list = cache.get(key);
+		
+		if (list == null) {
+			list = lookupTimetable(trainID,type);
+			cache.put(key, list);
+		} else {
+			logger.info("Timetable: Cache hit " + trainID); 
+		}
+		return list;
+	}
 
-	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {
+	List<TimetableBean> lookupTimetable(String trainID, String type) throws Throwable {		
 		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
 		
 		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
 				
 
 	    final WebClient webClient = new WebClient();
-	    webClient.setTimeout(1000);
+	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);	   
 	    webClient.setRefreshHandler( new NullRefreshHandler() );
 	    webClient.setCssEnabled(false);
 	    
 	    
-	    final HtmlPage page = webClient.getPage(url);
+	    BanedkInvocation wrapper = new BanedkInvocation(webClient, url);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
+	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
+	    	    
 	    
 	    boolean currentStation = false;
 	    boolean currentStationSaved = false;