--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/02 15:06:08	387
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/02/10 14:07:04	591
@@ -5,8 +5,10 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
+import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.RefreshHandler;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -14,6 +16,9 @@
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import dk.thoerup.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+
 public class TimetableFetcher {
 	
 	class NullRefreshHandler implements RefreshHandler {
@@ -22,41 +27,59 @@
 		
 	}
 		
-	TimeoutCache<String, List<TimetableBean>> cache = new TimeoutCache<String,List<TimetableBean>>(120 * 1000);
+	Map<String, List<TimetableBean>> cache; 
 	
 	
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
 	
+	private boolean useTempSite;
+	
+	public TimetableFetcher(boolean tmpSite, int cacheTimeout) {
+		useTempSite = tmpSite;
+		
+		cache = new TimeoutMap<String,List<TimetableBean>>(cacheTimeout);
+	}
+	
 	
 	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Exception {
 		String key = trainID+type;
 		List<TimetableBean> list = cache.get(key);
 		
 		if (list == null) {
-			logger.warning("Timetable: Cache miss " + trainID); //remove before production
 			list = lookupTimetable(trainID,type);
 			cache.put(key, list);
 		} else {
-			logger.warning("Timetable: Cache hit " + trainID); //remove before production
+			logger.info("Timetable: Cache hit " + trainID); 
 		}
 		return list;
 	}
+	
+	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {
+		if (useTempSite == false ){
+			return lookupTimetableRealSite(trainID, type);
+		} else {
+			return new ArrayList<TimetableBean>(); // no timetable data on temp site
+		}
+	}
 
-	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {		
+	List<TimetableBean> lookupTimetableRealSite(String trainID, String type) throws Exception {		
 		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();
+	    final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
 	    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;
@@ -96,6 +119,7 @@
 	    } else {
 	    	logger.warning("No time table found, trainID=" + trainID + " type=" + type);
 	    }
+	    webClient.closeAllWindows();
 		
 		return timetableList;
 	}