--- 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/02 18:47:55 581 @@ -15,8 +15,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 { @@ -31,8 +31,14 @@ Logger logger = Logger.getLogger(TimetableFetcher.class.getName()); + private boolean useTempSite; - List cachedLookupTimetable(String trainID, String type) throws Throwable { + public TimetableFetcher(boolean tmpSite) { + useTempSite = tmpSite; + } + + + List cachedLookupTimetable(String trainID, String type) throws Exception { String key = trainID+type; List list = cache.get(key); @@ -44,8 +50,16 @@ } return list; } + + List lookupTimetable(String trainID, String type) throws Exception { + if (useTempSite == false ){ + return lookupTimetableRealSite(trainID, type); + } else { + return new ArrayList(); // no timetable data on temp site + } + } - List lookupTimetable(String trainID, String type) throws Throwable { + List lookupTimetableRealSite(String trainID, String type) throws Exception { List timetableList = new ArrayList(); String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";