--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/06/10 22:26:09 829 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/07/10 11:01:07 980 @@ -1,6 +1,6 @@ package dk.thoerup.traininfoservice.banedk; -import java.util.ArrayList; + import java.util.Collections; import java.util.List; import java.util.Map; @@ -20,9 +20,14 @@ public class DepartureFetcher { + enum TrainType{ + STOG, + REGIONAL + } + Logger logger = Logger.getLogger(DepartureFetcher.class.getName()); - Map> cache; + Map cache; StationDAO stationDao = new StationDAO(); @@ -30,77 +35,96 @@ public DepartureFetcher(boolean tempSite, int cacheTimeout) { useTempSite = tempSite; - cache = new TimeoutMap>(cacheTimeout); + cache = new TimeoutMap(cacheTimeout); } - public List cachedLookupDepartures(int stationID, boolean arrival) throws Exception { + public DepartureBean cachedLookupDepartures(int stationID, boolean arrival) throws Exception { final String key = "" + stationID + ":" + arrival; - List list = cache.get(key); + DepartureBean departureBean = cache.get(key); - if (list == null) { - list = lookupDepartures(stationID,arrival); - cache.put(key, list); + if (departureBean == null) { + departureBean = lookupDepartures(stationID,arrival); + cache.put(key, departureBean); } else { Statistics.getInstance().incrementDepartureCacheHits(); logger.info("Departure: Cache hit " + key); //remove before production } - return list; + return departureBean; } - public List lookupDepartures(int stationID, boolean arrival) throws Exception { - List departureList = new ArrayList(); + public DepartureBean lookupDepartures(int stationID, boolean arrival) throws Exception { + + DepartureBean departureBean = new DepartureBean(); StationBean station = stationDao.getById(stationID); if (station.getRegional() != null) { - List list = lookupDepartures(station.getRegional(), "FJRN", arrival); - departureList.addAll(list); + DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival); + departureBean.departureEntries.addAll( tempBean.departureEntries ); + departureBean.notifications.addAll(tempBean.notifications); } if (station.getStrain() != null) { - List list = lookupDepartures(station.getStrain(), "S2", arrival); - departureList.addAll(list); + DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival); + departureBean.departureEntries.addAll( tempBean.departureEntries ); + departureBean.notifications.addAll(tempBean.notifications); } - Collections.sort( departureList ); + Collections.sort( departureBean.departureEntries ); - return departureList; + return departureBean; } - public List lookupDepartures(String stationcode, String type, boolean arrival) throws Exception { + public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception { if (useTempSite == false) { return lookupDeparturesNormalSite(stationcode, type, arrival); } else { - return lookupDeparturesFromTemporarySite(stationcode, type); + //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, String type, boolean arrival) throws Exception { + public DepartureBean lookupDeparturesNormalSite(String stationcode, TrainType type, boolean arrival) throws Exception { - List departureList = new ArrayList(); + DepartureBean departureBean = new DepartureBean(); 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; - BanedkInvocation wrapper = new BanedkInvocation(webClient, uri); + //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"); HtmlPage page = (HtmlPage) breaker.invoke(wrapper); String tableName = arrival == false ? "afgangtabel" : "ankomsttabel"; - - System.out.println(uri); - System.out.println(tableName); - HtmlElement table = page.getElementById(tableName); if (table != null) { @@ -111,7 +135,7 @@ if (rowClass != null && rowClass.toLowerCase().contains("station") ) { DomNodeList fields = currentRow.getElementsByTagName("td"); - DepartureBean departure = new DepartureBean(); + DepartureEntry departure = new DepartureEntry(); String time = fields.get(0).asText(); if (time.equals("")) @@ -122,7 +146,7 @@ departure.setUpdated(updated); String trainNumber = fields.get(2).asText(); - if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber + if (type == TrainType.STOG) //If it is S-train we need to extract the trainNumber trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2)); departure.setTrainNumber(trainNumber); @@ -135,25 +159,43 @@ 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(type); + departure.setType(typeString); - departureList.add(departure); + departureBean.departureEntries.add( departure ); } } } else { logger.warning("No departures found for station=" + stationcode + ", type=" + type); } + + HtmlElement notifDiv = page.getElementById("station_planlagte_text"); + if (notifDiv != null) { + + DomNodeList tables = notifDiv.getElementsByTagName("table"); + for (HtmlElement tab : tables) { + + DomNodeList anchors = tab.getElementsByTagName("a"); + if (anchors.size() == 2) { + departureBean.notifications.add( anchors.get(1).getTextContent() ); + } + } + + } + + webClient.closeAllWindows(); - return departureList; + return departureBean; } + /* + @Deprecated public List lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception { List departureList = new ArrayList(); @@ -165,7 +207,7 @@ String uri = "http://bane.dk/lite/station.asp?w=" + type + "&s=" + stationcode; - BanedkInvocation wrapper = new BanedkInvocation(webClient, uri); + HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); HtmlPage page = (HtmlPage) breaker.invoke(wrapper); @@ -218,7 +260,7 @@ return departureList; - } + }*/ private int extractUpdated(HtmlElement updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" @@ -250,19 +292,11 @@ } 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; }