--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/07/14 19:22:23 994 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2011/03/31 17:13:19 1248 @@ -11,9 +11,11 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; +import dk.thoerup.android.traininfo.common.DepartureBean; +import dk.thoerup.android.traininfo.common.DepartureEntry; +import dk.thoerup.android.traininfo.common.StationBean.StationEntry; 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; @@ -24,30 +26,39 @@ REGIONAL } + enum FetchTrainType { + STOG, + REGIONAL, + BOTH + } + Logger logger = Logger.getLogger(DepartureFetcher.class.getName()); Map cache; StationDAO stationDao = new StationDAO(); - private boolean useTempSite; + private boolean useAzureSite; + private int replyTimeout; - public DepartureFetcher(boolean tempSite, int cacheTimeout) { - useTempSite = tempSite; + public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) { + this.replyTimeout = replyTimeout; + useAzureSite = azureSite; cache = new TimeoutMap(cacheTimeout); } - public DepartureBean cachedLookupDepartures(int stationID, boolean arrival) throws Exception { - final String key = "" + stationID + ":" + arrival; + public DepartureBean cachedLookupDepartures(int stationID, boolean arrival, FetchTrainType type) throws Exception { + + final String key = "" + stationID + ":" + arrival + ":" + type.toString(); DepartureBean departureBean = cache.get(key); if (departureBean == null) { - departureBean = lookupDepartures(stationID,arrival); + departureBean = lookupDepartures(stationID, arrival, type); cache.put(key, departureBean); } else { Statistics.getInstance().incrementDepartureCacheHits(); @@ -57,41 +68,45 @@ } - public DepartureBean lookupDepartures(int stationID, boolean arrival) throws Exception { + public DepartureBean lookupDepartures(int stationID, boolean arrival, FetchTrainType type) throws Exception { DepartureBean departureBean = new DepartureBean(); - StationBean station = stationDao.getById(stationID); + StationEntry station = stationDao.getById(stationID); + + departureBean.stationName = station.getName(); - if (station.getRegional() != null) { + if (station.getRegional() != null && (type == FetchTrainType.REGIONAL||type == FetchTrainType.BOTH) ) { DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival); - departureBean.departureEntries.addAll( tempBean.departureEntries ); + departureBean.entries.addAll( tempBean.entries ); departureBean.notifications.addAll(tempBean.notifications); } - if (station.getStrain() != null) { + if (station.getStrain() != null && (type == FetchTrainType.STOG||type == FetchTrainType.BOTH)) { DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival); - departureBean.departureEntries.addAll( tempBean.departureEntries ); + departureBean.entries.addAll( tempBean.entries ); departureBean.notifications.addAll(tempBean.notifications); } - Collections.sort( departureBean.departureEntries ); + if (departureBean.entries.size() == 0) { + logger.info("No departures found for station " + stationID); + } + + Collections.sort( departureBean.entries ); return departureBean; } public DepartureBean 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; + if (useAzureSite == true) { + return lookupDeparturesAzureSite(stationcode, type, arrival); + } else { + return lookupDeparturesWwwSite(stationcode, type, arrival); } } - private String getTypeString(TrainType type) { + private String getTypeStringAzure(TrainType type) { switch (type) { case STOG: return "S-Tog"; @@ -102,22 +117,31 @@ } } - public DepartureBean lookupDeparturesNormalSite(String stationcode, TrainType type, boolean arrival) throws Exception { + private String getTypeStringWww(TrainType type) { + switch (type) { + case STOG: + return "S2"; + case REGIONAL: + return "FJRN"; + default: + return ""; //Can not happen + } + } + + public DepartureBean lookupDeparturesAzureSite(String stationcode, TrainType type, boolean arrival) throws Exception { DepartureBean departureBean = new DepartureBean(); - String typeString = getTypeString(type); + String typeString = getTypeStringAzure(type); String arrivalDeparture = (arrival==false) ? "Afgang" : "Ankomst"; stationcode = URLEncoder.encode(stationcode,"ISO-8859-1"); - //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"; + String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning"; - - //logger.info("URI: " + uri); - JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), 2500); + logger.fine("URI: " + uri); + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); Document page = (Document) breaker.invoke(wrapper); @@ -128,9 +152,22 @@ if (table != null) { Elements tableRows = table.getElementsByTag("tr"); + //boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); + //boolean passedTidsstreg = false; + for (Element currentRow : tableRows) { String rowClass = currentRow.attr("class"); + /* + if (tidsstregExists == true && passedTidsstreg == false) { + if (currentRow.getElementsByAttributeValue("class", "Tidsstreg").size() > 0) { + passedTidsstreg = true; + } else { + continue; + } + }*/ + if (rowClass != null && rowClass.toLowerCase().contains("station") ) { + Elements fields = currentRow.getElementsByTag("td"); DepartureEntry departure = new DepartureEntry(); @@ -145,7 +182,7 @@ String trainNumber = fields.get(2).text(); if (type == TrainType.STOG) //If it is S-train we need to extract the trainNumber - trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2)); + trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2)); departure.setTrainNumber(trainNumber); String destination = fields.get(3).text(); @@ -165,7 +202,7 @@ departure.setType(typeString); - departureBean.departureEntries.add( departure ); + departureBean.entries.add( departure ); } } } else { @@ -190,74 +227,104 @@ return departureBean; } - /* - @Deprecated - public List lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception { + + + public static String cleanText(String input) { + //apparently JSoup translates   characters on www.bane.dk to 0xA0 + return input.replace((char) 0xA0, (char)0x20).trim(); + } + + public DepartureBean lookupDeparturesWwwSite(String stationcode, TrainType trainType, boolean arrival) throws Exception { + + DepartureBean departureBean = new DepartureBean(); + + String type = getTypeStringWww(trainType); - List departureList = new ArrayList(); + stationcode = URLEncoder.encode(stationcode, "ISO-8859-1"); - final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3); - webClient.setTimeout(2500); - webClient.setJavaScriptEnabled(false); + + String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode; + logger.fine("URI:" + uri); - String uri = "http://bane.dk/lite/station.asp?w=" + type + "&s=" + stationcode; - - HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri); + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); - HtmlPage page = (HtmlPage) breaker.invoke(wrapper); + Element page = (Element) breaker.invoke(wrapper); - HtmlElement table = page.getElementById("traf_afgang"); + String tableName = arrival == false ? "afgangtabel" : "ankomsttabel"; + Element table = page.getElementById(tableName); + + - if (table != null) { - DomNodeList tableRows = table.getElementsByTagName("tr"); + if (table != null) { + Elements tableRows = table.getElementsByTag("tr"); - boolean isFirst = true; + //boolean passedTidsstreg = false; + //boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); - for (HtmlElement currentRow : tableRows) { - if (isFirst == true) { //skip table headers - isFirst = false; - continue; - } + for (Element currentRow : tableRows) { + String rowClass = currentRow.attr("class"); + /* + if (tidsstregExists == true && passedTidsstreg == false) { + if (currentRow.getElementsByAttributeValue("class", "Tidsstreg").size() > 0) { + passedTidsstreg = true; + } else { + 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); + + if (rowClass != null && rowClass.toLowerCase().contains("station") ) { + Elements fields = currentRow.getElementsByTag("td"); + + DepartureEntry departure = new DepartureEntry(); + - departureList.add(departure); + + String time = cleanText( fields.get(0).getAllElements().get(2).text() ); + if (time.equals("")) + time = "0:00"; //Bane.dk bug work-around + departure.setTime(time); + + int updated = extractUpdated( fields.get(1) ); + departure.setUpdated(updated); + + String trainNumber = cleanText( fields.get(2).text() ); + if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber + trainNumber = trainNumber + " " + extractTrainNumberWww(fields.get(2)); + departure.setTrainNumber(trainNumber); + + String destination = cleanText( fields.get(3).text() ); + departure.setDestination(destination); + + String origin = cleanText( fields.get(4).text() ); + departure.setOrigin(origin); + + String location = cleanText( fields.get(5).text() ); + departure.setLocation(location); + + String status = cleanText( fields.get(6).text() ); + departure.setStatus(status); + + String note = cleanText( extractNote( fields.get(7) ) ); + departure.setNote(note); + + departure.setType(type); + + departureBean.entries.add(departure); + + + } } } else { logger.warning("No departures found for station=" + stationcode + ", type=" + type); } - webClient.closeAllWindows(); - return departureList; - }*/ - + return departureBean; + } + private int extractUpdated(Element updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" int updated = -1; @@ -285,10 +352,10 @@ if (elems.size() > 0 && note.charAt(note.length()-1) == 'i') note = note.substring(0,note.length() -1 ); - return note; + return note.trim(); } - private String extractTrainNumber(Element trainTd) { + private String extractTrainNumberAzure(Element trainTd) { Element anchorElement = trainTd.getElementsByTag("a").get(0); String href = anchorElement.attr("href"); @@ -298,6 +365,25 @@ return number; } + private String extractTrainNumberWww(Element trainTd) { + String number = ""; + Element anchorElement = trainTd.getElementsByTag("a").get(0); + String href = anchorElement.attr("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]; + } + + + return number; + } + + //test /* public static void main(String args[]) throws Exception {