--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/08/30 11:53:34 1020 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/09/12 18:41:17 1038 @@ -30,10 +30,12 @@ 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); } @@ -63,6 +65,8 @@ StationBean station = stationDao.getById(stationID); + departureBean.stationName = station.getName(); + if (station.getRegional() != null) { DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival); departureBean.departureEntries.addAll( tempBean.departureEntries ); @@ -75,6 +79,10 @@ departureBean.notifications.addAll(tempBean.notifications); } + if (departureBean.departureEntries.size() == 0) { + logger.info("No departures found for station " + stationID); + } + Collections.sort( departureBean.departureEntries ); @@ -82,16 +90,14 @@ } 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 +108,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); + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); Document page = (Document) breaker.invoke(wrapper); @@ -203,74 +218,84 @@ return departureBean; } - /* - @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); + + + String cleanText(String input) { + //apparently JSoup interprets some of space characters on www.bane.dk as 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); + + + String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode; + 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"); - - boolean isFirst = true; + if (table != null) { + Elements tableRows = table.getElementsByTag("tr"); - 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); + for (Element currentRow : tableRows) { + String rowClass = currentRow.attr("class"); + 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 + " " + extractTrainNumber(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.departureEntries.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; @@ -298,7 +323,7 @@ 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) {