--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/09/14 05:33:30 1046 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2012/08/21 06:45:41 1833 @@ -4,6 +4,7 @@ import java.net.URL; import java.net.URLEncoder; import java.util.Collections; +import java.util.Comparator; import java.util.Map; import java.util.logging.Logger; @@ -11,11 +12,16 @@ 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.StationEntry; import dk.thoerup.circuitbreaker.CircuitBreaker; import dk.thoerup.circuitbreaker.CircuitBreakerManager; -import dk.thoerup.traininfoservice.StationBean; -import dk.thoerup.traininfoservice.StationDAO; +import dk.thoerup.genericjavautils.HttpUtil; +import dk.thoerup.genericjavautils.TimeoutMap; import dk.thoerup.traininfoservice.Statistics; +import dk.thoerup.traininfoservice.TraininfoSettings; +import dk.thoerup.traininfoservice.db.StationDAO; public class DepartureFetcher { @@ -24,32 +30,72 @@ 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); + Comparator departureTimeComparator = new Comparator() { + + @Override + public int compare(DepartureEntry arg0, DepartureEntry arg1) { + String timeStr1 = arg0.getTime().replace(":","").trim(); + String timeStr2 = arg1.getTime().replace(":","").trim(); + + int time1 = 0; + int time2 = 0; + + if (timeStr1.length() > 0) + time1 = Integer.parseInt(timeStr1); + + if (timeStr2.length() > 0) + time2 = Integer.parseInt(timeStr2); + + //work correctly when clock wraps around at midnight + if (Math.abs(time1-time2) < 1200) { + if (time1 > time2) + return 1; + else + return -1; + } else { + if (time1 < time2) + return 1; + else + return -1; + + } + + } + + }; + + 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,41 +105,54 @@ } - 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) { + + //TODO: FetchTraintype.Both should be removed some time after 0.9.5 release + 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); } - if (departureBean.departureEntries.size() == 0) { + if (departureBean.entries.size() == 0) { logger.info("No departures found for station " + stationID); } - Collections.sort( departureBean.departureEntries ); + //TODO: FetchTraintype.Both should be removed some time after 0.9.5 release + if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time + Collections.sort( departureBean.entries, departureTimeComparator); + } + + System.out.println("Trit: " + settings.isTritinfoEnabled() + " " + station.getTritStation() ); + if ( settings.isTritinfoEnabled() && station.getTritStation() != -1) { + try { + injectTritinfoData(departureBean, station); + } catch (Exception ex) { //det er ikke kritisk at vi får perron numre med + ex.printStackTrace(); + } + } return departureBean; } public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception { - if (useAzureSite == true) { + if ( settings.getBackend() == TraininfoSettings.Backend.Azure) { return lookupDeparturesAzureSite(stationcode, type, arrival); } else { - return lookupDeparturesWwwSite(stationcode, type, arrival); + return lookupDeparturesMobileSite(stationcode, type, arrival); } } @@ -131,8 +190,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); @@ -143,19 +202,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") ) { @@ -193,7 +252,7 @@ departure.setType(typeString); - departureBean.departureEntries.add( departure ); + departureBean.entries.add( departure ); } } } else { @@ -218,6 +277,112 @@ return departureBean; } + public DepartureBean lookupDeparturesMobileSite(String stationcode, TrainType traintype, boolean arrival) throws Exception { + + DepartureBean departureBean = new DepartureBean(); + + + String typeString = getTypeStringWww(traintype); + String arrivalDeparture = (arrival==false) ? "afgang" : "ankomst"; + + stationcode = URLEncoder.encode(stationcode,"ISO-8859-1"); + + + String uri = "http://mobil.bane.dk/mobilStation.asp?artikelID=5332&stat_kode=" + stationcode + "&webprofil=" + typeString +"&beskrivelse=&mode=ankomstafgang&ankomstafgang=" + arrivalDeparture + "&gemstation=&fuldvisning=1"; + 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); + + + Element content = page.getElementsByClass("contentDiv").get(0); + + + if (content != null) { + Elements tableRows = content.child(0).children(); + + + + for (Element currentRow : tableRows) { + if (currentRow.tagName().equals("br") ) { + break; + } + + + String link = currentRow.child(0).attr("href"); + + logger.fine( currentRow.text() ); + logger.fine("Href: " + link); + + + String parts[] = currentRow.text().split(","); + + + DepartureEntry departure = new DepartureEntry(); + + //if we do these things upfront, then we are allowed to use continue statement when row contains no more data + departure.setType(typeString); + departureBean.entries.add( departure ); + +/* +http://mobil.bane.dk/mobilStation.asp?artikelID=5332&tognummer=111&webprofil=FJRN&mode=rute&strBemaerkning=Afg%E5r+fra+%C5rhus+H+kl%2E07%3A21++&strRefURL=%2FmobilStation%2Easp%3FartikelID%3D5332%26stat%5Fkode%3DAR%26webprofil%3DFJRN%26beskrivelse%3D%25C5rhus%2BH%26mode%3Dankomstafgang%26ankomstafgang%3Dafgang%26gemstation%3D +*/ + int offset = 0; + + String time = parts[offset++]; + if (time.equals("")) + time = "0:00"; //Bane.dk bug work-around + departure.setTime(time); + + int updated = 4; //does not exist on mobile + departure.setUpdated(updated); + + String trainNumber = extractTrainNumberMobile(link); + /*if (traintype == TrainType.STOG) //If it is S-train we need to extract the trainNumber + trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2));*/ + departure.setTrainNumber(trainNumber); + + if (traintype == TrainType.STOG) { //if it is stog the next vield is the "Line" code - this should be used somewhere, but skippint ahead for now + String stogLine = parts[offset++].trim(); + departure.setTrainNumber(stogLine + " " + trainNumber); + } + + String destination = parts[offset++].trim();; + departure.setDestination(destination); + + String origin = "-"; // fields.get(4).text(); does not exist on mobile + departure.setOrigin(origin); + + String location = ""; // fields.get(5).text(); does not exist on mobile + departure.setLocation(location); + + if (offset == parts.length) { + continue; + } + + if (parts[offset].trim().equalsIgnoreCase("NB!")) { + offset++; + } + + if (offset == parts.length) { + continue; + } + + String status = parts[offset++].trim();; //fields.get(6).text().trim(); - extract from url + departure.setStatus(status); + + String note = ""; //extractNote( fields.get(7) ); - extract from url + departure.setNote(note); + + } + } else { + logger.warning("No departures found for station=" + stationcode + ", type=" + traintype); + } + + return departureBean; + } + public static String cleanText(String input) { @@ -225,6 +390,9 @@ return input.replace((char) 0xA0, (char)0x20).trim(); } + + // old www site is not available any more + @Deprecated public DepartureBean lookupDeparturesWwwSite(String stationcode, TrainType trainType, boolean arrival) throws Exception { DepartureBean departureBean = new DepartureBean(); @@ -235,8 +403,10 @@ String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode; - 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"); Element page = (Element) breaker.invoke(wrapper); @@ -249,19 +419,19 @@ if (table != null) { Elements tableRows = table.getElementsByTag("tr"); - boolean passedTidsstreg = false; - boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); + //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") ) { @@ -301,7 +471,7 @@ departure.setType(type); - departureBean.departureEntries.add(departure); + departureBean.entries.add(departure); } @@ -354,23 +524,80 @@ return number; } + private String extractTrainNumberMobile(String link) { + Map elements = HttpUtil.decodeParams(link); + + return elements.get("tognummer"); + } + 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 argstring = href.split("?")[1]; + Map elements = HttpUtil.decodeParams(argstring); + number = elements.get("TogNr"); + + /*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; } + + + private void injectTritinfoData(DepartureBean departureBean, StationEntry station) throws Exception { + String uri = "http://tritinfo.pallas.dk/webtavle?page=stationcontent&staid=" + station.getTritStation(); + logger.fine("URI:" + uri); + System.out.println("URI:" + uri); + + + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), settings.getReplyTimeout() ); + CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("tritinfo"); + + Element page = (Element) breaker.invoke(wrapper); + + Element table = page.getElementsByClass("passages").get(0); + + Elements trains = table.getElementsByClass("train"); + + for (int i=0; i