--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/09/08 12:31:55 1034 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2011/04/19 15:07:23 1305 @@ -11,11 +11,14 @@ 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; +import dk.thoerup.traininfoservice.TraininfoSettings; +import dk.thoerup.traininfoservice.db.StationDAO; public class DepartureFetcher { @@ -24,32 +27,38 @@ REGIONAL } + enum FetchTrainType { + STOG, + REGIONAL, + BOTH + } + Logger logger = Logger.getLogger(DepartureFetcher.class.getName()); Map cache; StationDAO stationDao = new StationDAO(); - private boolean useAzureSite; - private int replyTimeout; + + private TraininfoSettings settings; - public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) { - this.replyTimeout = replyTimeout; - useAzureSite = azureSite; - cache = new TimeoutMap(cacheTimeout); + public DepartureFetcher(TraininfoSettings settings) { + this.settings = settings; + cache = new TimeoutMap( settings.getCacheTimeout() ); } - 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(); @@ -59,34 +68,40 @@ } - 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); + } + + if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time + Collections.sort( departureBean.entries ); + } return departureBean; } public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception { - if (useAzureSite == true) { + if ( settings.getUseAzureSite() == true) { return lookupDeparturesAzureSite(stationcode, type, arrival); } else { return lookupDeparturesWwwSite(stationcode, type, arrival); @@ -127,8 +142,8 @@ String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning"; - //logger.info("URI: " + uri); - JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); + logger.fine("URI: " + uri); + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() ); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); Document page = (Document) breaker.invoke(wrapper); @@ -139,19 +154,19 @@ if (table != null) { Elements tableRows = table.getElementsByTag("tr"); - boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); - boolean passedTidsstreg = false; + //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") ) { @@ -169,7 +184,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(); @@ -189,7 +204,7 @@ departure.setType(typeString); - departureBean.departureEntries.add( departure ); + departureBean.entries.add( departure ); } } } else { @@ -214,15 +229,27 @@ return departureBean; } + + + 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); + stationcode = URLEncoder.encode(stationcode, "ISO-8859-1"); + String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode; - JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); + logger.fine("URI:" + uri); + + + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() ); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); Element page = (Element) breaker.invoke(wrapper); @@ -230,11 +257,26 @@ String tableName = arrival == false ? "afgangtabel" : "ankomsttabel"; Element table = page.getElementById(tableName); + + if (table != null) { Elements tableRows = table.getElementsByTag("tr"); + //boolean passedTidsstreg = false; + //boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); + 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"); @@ -242,40 +284,37 @@ - String time = fields.get(0).getAllElements().get(2).text(); + String time = cleanText( fields.get(0).getAllElements().get(2).text() ); if (time.equals("")) time = "0:00"; //Bane.dk bug work-around departure.setTime(time); - logger.info("Time: " + time);// TODO: remove int updated = extractUpdated( fields.get(1) ); departure.setUpdated(updated); - logger.info("Updated: " + updated);// TODO: remove - String trainNumber = fields.get(2).text(); + 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)); + trainNumber = trainNumber + " " + extractTrainNumberWww(fields.get(2)); departure.setTrainNumber(trainNumber); - logger.info("TrainNumber: " + trainNumber);// TODO: remove - String destination = fields.get(3).text(); + String destination = cleanText( fields.get(3).text() ); departure.setDestination(destination); - String origin = fields.get(4).text(); + String origin = cleanText( fields.get(4).text() ); departure.setOrigin(origin); - String location = fields.get(5).text(); + String location = cleanText( fields.get(5).text() ); departure.setLocation(location); - String status = fields.get(6).text().trim(); + String status = cleanText( fields.get(6).text() ); departure.setStatus(status); - String note = extractNote( fields.get(7) ); + String note = cleanText( extractNote( fields.get(7) ) ); departure.setNote(note); departure.setType(type); - departureBean.departureEntries.add(departure); + departureBean.entries.add(departure); } @@ -315,10 +354,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"); @@ -328,6 +367,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 {