--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/09 08:52:37	428
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/02/10 14:07:04	591
@@ -8,6 +8,7 @@
 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;
@@ -15,8 +16,8 @@
 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.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 
 public class TimetableFetcher {
 	
@@ -26,13 +27,21 @@
 		
 	}
 		
-	Map<String, List<TimetableBean>> cache = new TimeoutMap<String,List<TimetableBean>>(120 * 1000);
+	Map<String, List<TimetableBean>> cache; 
 	
 	
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
 	
+	private boolean useTempSite;
 	
-	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Throwable {
+	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);
 		
@@ -44,14 +53,22 @@
 		}
 		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 Throwable {		
+	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() );
@@ -102,6 +119,7 @@
 	    } else {
 	    	logger.warning("No time table found, trainID=" + trainID + " type=" + type);
 	    }
+	    webClient.closeAllWindows();
 		
 		return timetableList;
 	}