--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/02/02 19:05:08 582 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/06/10 22:36:25 830 @@ -1,14 +1,12 @@ package dk.thoerup.traininfoservice.banedk; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; 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.BrowserVersion; import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.html.DomNodeList; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -16,87 +14,79 @@ import dk.thoerup.circuitbreaker.CircuitBreaker; import dk.thoerup.circuitbreaker.CircuitBreakerManager; -import dk.thoerup.traininfoservice.DBConnection; +import dk.thoerup.traininfoservice.StationBean; +import dk.thoerup.traininfoservice.StationDAO; +import dk.thoerup.traininfoservice.Statistics; public class DepartureFetcher { Logger logger = Logger.getLogger(DepartureFetcher.class.getName()); - Map> cache = new TimeoutMap>(120 * 1000); + Map> cache; + + StationDAO stationDao = new StationDAO(); private boolean useTempSite; - public DepartureFetcher(boolean tempSite) { + public DepartureFetcher(boolean tempSite, int cacheTimeout) { useTempSite = tempSite; + cache = new TimeoutMap>(cacheTimeout); } - public List cachedLookupDepartures(int stationID) throws Exception { + public List cachedLookupDepartures(int stationID, boolean arrival) throws Exception { + final String key = "" + stationID + ":" + arrival; + + List list = cache.get(key); - List list = cache.get(stationID); if (list == null) { - list = lookupDepartures(stationID); - cache.put(stationID, list); + list = lookupDepartures(stationID,arrival); + cache.put(key, list); } else { - logger.info("Departure: Cache hit " + stationID); //remove before production + Statistics.getInstance().incrementDepartureCacheHits(); + logger.info("Departure: Cache hit " + key); //remove before production } return list; } - public List lookupDepartures(int stationID) throws Exception { + public List lookupDepartures(int stationID, boolean arrival) throws Exception { List departureList = new ArrayList(); - Connection conn = null; - try - { - conn = DBConnection.getConnection(); - - String SQL = "SELECT stationcode_fjrn, stationcode_stog FROM trainstations WHERE id=" + stationID; - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(SQL); - - if (rs.next()) { - String code = rs.getString( 1 ); - if (! rs.wasNull() ) { - List list = lookupDepartures(code, "FJRN"); - departureList.addAll(list); - } - - code = rs.getString(2); - if (! rs.wasNull() ) { - List list = lookupDepartures(code, "S2"); - departureList.addAll(list); - } - Collections.sort( departureList ); - - } - - } finally { - if (conn != null && !conn.isClosed() ) { - conn.close(); - } + StationBean station = stationDao.getById(stationID); + + if (station.getRegional() != null) { + List list = lookupDepartures(station.getRegional(), "FJRN", arrival); + departureList.addAll(list); } + if (station.getStrain() != null) { + List list = lookupDepartures(station.getStrain(), "S2", arrival); + departureList.addAll(list); + } + + Collections.sort( departureList ); + + return departureList; } - public List lookupDepartures(String stationcode, String type) throws Exception { + public List lookupDepartures(String stationcode, String type, boolean arrival) throws Exception { if (useTempSite == false) { - return lookupDeparturesNormalSite(stationcode, type); + return lookupDeparturesNormalSite(stationcode, type, arrival); } else { return lookupDeparturesFromTemporarySite(stationcode, type); } } - public List lookupDeparturesNormalSite(String stationcode, String type) throws Exception { + public List lookupDeparturesNormalSite(String stationcode, String type, boolean arrival) throws Exception { List departureList = new ArrayList(); - final WebClient webClient = new WebClient(); + final WebClient webClient = new WebClient( BrowserVersion.FIREFOX_3 ); webClient.setTimeout(2500); webClient.setJavaScriptEnabled(false); @@ -106,7 +96,8 @@ HtmlPage page = (HtmlPage) breaker.invoke(wrapper); - HtmlElement table = page.getElementById("afgangtabel"); + String tableName = arrival == false ? "afgangtabel" : "ankomsttabel"; + HtmlElement table = page.getElementById(tableName); if (table != null) { DomNodeList tableRows = table.getElementsByTagName("tr"); @@ -146,12 +137,15 @@ String note = extractNote( fields.get(7) ); departure.setNote(note); + departure.setType(type); + departureList.add(departure); } } } else { logger.warning("No departures found for station=" + stationcode + ", type=" + type); } + webClient.closeAllWindows(); return departureList; } @@ -160,7 +154,7 @@ List departureList = new ArrayList(); - final WebClient webClient = new WebClient(); + final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3); webClient.setTimeout(2500); webClient.setJavaScriptEnabled(false); @@ -190,7 +184,7 @@ DepartureBean departure = new DepartureBean(); String time = fields.get(0).asText().trim(); - logger.info("time:" + time); + if (time.equals("")) time = "0:00"; //Bane.dk bug work-around departure.setTime(time); @@ -216,6 +210,8 @@ } else { logger.warning("No departures found for station=" + stationcode + ", type=" + type); } + webClient.closeAllWindows(); + return departureList; } @@ -264,7 +260,6 @@ } - return number; }