--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/07/09 22:28:07 973 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/08/30 13:59:54 1021 @@ -1,16 +1,15 @@ package dk.thoerup.traininfoservice.banedk; -import java.util.ArrayList; + +import java.net.URL; +import java.net.URLEncoder; import java.util.Collections; -import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.gargoylesoftware.htmlunit.BrowserVersion; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.DomNodeList; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; import dk.thoerup.circuitbreaker.CircuitBreaker; import dk.thoerup.circuitbreaker.CircuitBreakerManager; @@ -27,7 +26,7 @@ Logger logger = Logger.getLogger(DepartureFetcher.class.getName()); - Map> cache; + Map cache; StationDAO stationDao = new StationDAO(); @@ -35,51 +34,56 @@ 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); + departureBean.stationName = station.getName(); + if (station.getRegional() != null) { - List list = lookupDepartures(station.getRegional(), TrainType.REGIONAL, 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(), TrainType.STOG, 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, TrainType 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 { @@ -100,41 +104,53 @@ } } - public List lookupDeparturesNormalSite(String stationcode, TrainType type, boolean arrival) throws Exception { + public DepartureBean lookupDeparturesNormalSite(String stationcode, TrainType type, boolean arrival) throws Exception { - List departureList = new ArrayList(); - - final WebClient webClient = new WebClient( BrowserVersion.FIREFOX_3 ); - webClient.setTimeout(2500); - webClient.setJavaScriptEnabled(false); - + DepartureBean departureBean = new DepartureBean(); + String typeString = getTypeString(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"; - //logger.info("URI: " + uri); - HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri); + + + //logger.info("URI: " + uri); + JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), 2500); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); - HtmlPage page = (HtmlPage) breaker.invoke(wrapper); + Document page = (Document) breaker.invoke(wrapper); String tableName = arrival == false ? "afgangtabel" : "ankomsttabel"; - HtmlElement table = page.getElementById(tableName); + Element table = page.getElementById(tableName); if (table != null) { - DomNodeList tableRows = table.getElementsByTagName("tr"); + Elements tableRows = table.getElementsByTag("tr"); - for (HtmlElement currentRow : tableRows) { - String rowClass = currentRow.getAttribute("class"); + 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") ) { - DomNodeList fields = currentRow.getElementsByTagName("td"); + + Elements fields = currentRow.getElementsByTag("td"); - DepartureBean departure = new DepartureBean(); + DepartureEntry departure = new DepartureEntry(); - String time = fields.get(0).asText(); + String time = fields.get(0).text(); if (time.equals("")) time = "0:00"; //Bane.dk bug work-around departure.setTime(time); @@ -142,21 +158,21 @@ int updated = extractUpdated( fields.get(1) ); departure.setUpdated(updated); - String trainNumber = fields.get(2).asText(); + 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)); departure.setTrainNumber(trainNumber); - String destination = fields.get(3).asText(); + String destination = fields.get(3).text(); departure.setDestination(destination); - String origin = fields.get(4).asText(); + String origin = fields.get(4).text(); departure.setOrigin(origin); - String location = fields.get(5).asText(); + String location = fields.get(5).text(); departure.setLocation(location); - String status = fields.get(6).asText().trim(); + String status = fields.get(6).text().trim(); departure.setStatus(status); String note = extractNote( fields.get(7) ); @@ -164,17 +180,33 @@ departure.setType(typeString); - departureList.add(departure); + departureBean.departureEntries.add( departure ); } } } else { logger.warning("No departures found for station=" + stationcode + ", type=" + type); } - webClient.closeAllWindows(); - return departureList; + Element notifDiv = page.getElementById("station_planlagte_text"); + if (notifDiv != null) { + + Elements tables = notifDiv.getElementsByTag("table"); + for (Element tab : tables) { + + Elements anchors = tab.getElementsByTag("a"); + if (anchors.size() == 2) { + departureBean.notifications.add( anchors.get(1).text() ); + } + } + + } + + + return departureBean; } + /* + @Deprecated public List lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception { List departureList = new ArrayList(); @@ -239,14 +271,14 @@ return departureList; - } + }*/ - private int extractUpdated(HtmlElement updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" + private int extractUpdated(Element updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" int updated = -1; - DomNodeList updatedImgs = updatedTd.getElementsByTagName("img"); - String updatedStr = updatedImgs.get(0).getAttribute("src"); + Elements updatedImgs = updatedTd.getElementsByTag("img"); + String updatedStr = updatedImgs.get(0).attr("src"); if (updatedStr != null) { for (int i=0; i elems = noteTd.getElementsByAttribute("span", "class", "bemtype"); + Elements elems = noteTd.getElementsByClass("bemtype"); if (elems.size() > 0 && note.charAt(note.length()-1) == 'i') note = note.substring(0,note.length() -1 ); return note; } - private String extractTrainNumber(HtmlElement trainTd) { - HtmlElement anchorElement = trainTd.getElementsByTagName("a").get(0); - String href = anchorElement.getAttribute("href"); + private String extractTrainNumber(Element trainTd) { + Element anchorElement = trainTd.getElementsByTag("a").get(0); + String href = anchorElement.attr("href"); int pos = href.lastIndexOf('/'); String number = href.substring(pos+1);