--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2009/10/02 13:44:31 386 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/07/09 22:30:18 974 @@ -1,75 +1,128 @@ 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.ProxyConfig; +import com.gargoylesoftware.htmlunit.BrowserVersion; 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.traininfoservice.DBConnection; +import dk.thoerup.circuitbreaker.CircuitBreaker; +import dk.thoerup.circuitbreaker.CircuitBreakerManager; +import dk.thoerup.traininfoservice.StationBean; +import dk.thoerup.traininfoservice.StationDAO; +import dk.thoerup.traininfoservice.Statistics; public class DepartureFetcher { + enum TrainType{ + STOG, + REGIONAL + } + Logger logger = Logger.getLogger(DepartureFetcher.class.getName()); + + Map> cache; + + StationDAO stationDao = new StationDAO(); + + private boolean useTempSite; + + public DepartureFetcher(boolean tempSite, int cacheTimeout) { + useTempSite = tempSite; + cache = new TimeoutMap>(cacheTimeout); + } + + + + public List cachedLookupDepartures(int stationID, boolean arrival) throws Exception { + final String key = "" + stationID + ":" + arrival; + + List list = cache.get(key); - public List lookupDepartures(int stationID) throws Exception { + + if (list == null) { + list = lookupDepartures(stationID,arrival); + cache.put(key, list); + } else { + Statistics.getInstance().incrementDepartureCacheHits(); + logger.info("Departure: Cache hit " + key); //remove before production + } + return list; + } + + + 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(), TrainType.REGIONAL, arrival); + departureList.addAll(list); } + if (station.getStrain() != null) { + List list = lookupDepartures(station.getStrain(), TrainType.STOG, arrival); + departureList.addAll(list); + } + + Collections.sort( departureList ); + + return departureList; } - public List lookupDepartures(String stationcode, String type) throws Exception { + public List lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception { + if (useTempSite == false) { + return lookupDeparturesNormalSite(stationcode, type, arrival); + } else { + //return lookupDeparturesFromTemporarySite(stationcode, type); + //TODO: find out what to to if they ever put a temp site up on trafikinfo.bane.dk + return null; + } + } + + private String getTypeString(TrainType type) { + switch (type) { + case STOG: + return "S-Tog"; + case REGIONAL: + return "Fjerntog"; + default: + return ""; //Can not happen + } + } + + public List lookupDeparturesNormalSite(String stationcode, TrainType 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); + + + String typeString = getTypeString(type); + String arrivalDeparture = (arrival==false) ? "Afgang" : "Ankomst"; + //String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode; + String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning"; + + //logger.info("URI: " + uri); + HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri); + CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); - final HtmlPage page = webClient.getPage("http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode); + 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"); @@ -90,7 +143,7 @@ departure.setUpdated(updated); String trainNumber = fields.get(2).asText(); - if (trainNumber.trim().length() == 1) + if (type == TrainType.STOG) //If it is S-train we need to extract the trainNumber trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2)); departure.setTrainNumber(trainNumber); @@ -103,22 +156,94 @@ String location = fields.get(5).asText(); departure.setLocation(location); - String status = fields.get(6).asText(); + String status = fields.get(6).asText().trim(); departure.setStatus(status); String note = extractNote( fields.get(7) ); departure.setNote(note); + departure.setType(typeString); + departureList.add(departure); } } } else { logger.warning("No departures found for station=" + stationcode + ", type=" + type); } + webClient.closeAllWindows(); return departureList; } + /* + @Deprecated + public List lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception { + + List departureList = new ArrayList(); + + final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3); + webClient.setTimeout(2500); + webClient.setJavaScriptEnabled(false); + + + String uri = "http://bane.dk/lite/station.asp?w=" + type + "&s=" + stationcode; + + HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri); + CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); + + HtmlPage page = (HtmlPage) breaker.invoke(wrapper); + + HtmlElement table = page.getElementById("traf_afgang"); + + if (table != null) { + DomNodeList tableRows = table.getElementsByTagName("tr"); + + boolean isFirst = true; + + for (HtmlElement currentRow : tableRows) { + if (isFirst == true) { //skip table headers + isFirst = false; + continue; + } + + DomNodeList fields = currentRow.getElementsByTagName("td"); + + DepartureBean departure = new DepartureBean(); + + String time = fields.get(0).asText().trim(); + + if (time.equals("")) + time = "0:00"; //Bane.dk bug work-around + departure.setTime(time); + + + String trainNumber = fields.get(1).asText(); + departure.setTrainNumber(trainNumber); + + String destination = fields.get(2).asText(); + departure.setDestination(destination); + + String origin = fields.get(3).asText(); + departure.setOrigin(origin); + + String status = fields.get(4).asText(); + departure.setStatus(status); + + String note = fields.get(5).asText(); + departure.setNote(note); + + departureList.add(departure); + } + } else { + logger.warning("No departures found for station=" + stationcode + ", type=" + type); + } + webClient.closeAllWindows(); + + + return departureList; + }*/ + + private int extractUpdated(HtmlElement updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" int updated = -1; @@ -148,26 +273,18 @@ } private String extractTrainNumber(HtmlElement trainTd) { - String number = ""; HtmlElement anchorElement = trainTd.getElementsByTagName("a").get(0); String href = anchorElement.getAttribute("href"); - String argstring = href.substring( href.indexOf('?') + 1); - - String args[] = argstring.split("&"); - for (String arg : args) { - String pair[] = arg.split("="); // Key=pair[0], Value=pair[1] - - if (pair[0].equalsIgnoreCase("TogNr")) - number = pair[1]; - } - + int pos = href.lastIndexOf('/'); + String number = href.substring(pos+1); return number; } //test - public static void main(String args[]) throws Exception{ + /* + public static void main(String args[]) throws Exception { DepartureFetcher f = new DepartureFetcher(); List deps = f.lookupDepartures("AR", "FJRN"); for(DepartureBean d : deps) { @@ -176,5 +293,5 @@ } System.out.println("--------------------------"); - } + }*/ }