--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2011/04/20 05:20:43 1330 +++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2011/07/08 16:26:09 1562 @@ -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; @@ -13,9 +14,11 @@ 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.android.traininfo.common.StationEntry; import dk.thoerup.circuitbreaker.CircuitBreaker; import dk.thoerup.circuitbreaker.CircuitBreakerManager; +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; @@ -42,6 +45,40 @@ private TraininfoSettings settings; + 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() ); @@ -76,6 +113,7 @@ departureBean.stationName = station.getName(); + //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.entries.addAll( tempBean.entries ); @@ -92,8 +130,9 @@ logger.info("No departures found for station " + stationID); } + //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 ); + Collections.sort( departureBean.entries, departureTimeComparator); } @@ -101,7 +140,7 @@ } public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception { - if ( settings.getUseAzureSite() == true) { + if ( settings.getBackend() == TraininfoSettings.Backend.Azure) { return lookupDeparturesAzureSite(stationcode, type, arrival); } else { return lookupDeparturesMobileSite(stationcode, type, arrival); @@ -239,7 +278,7 @@ stationcode = URLEncoder.encode(stationcode,"ISO-8859-1"); - //String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning"; + 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() ); @@ -262,14 +301,20 @@ } - Element link = currentRow.child(0); - System.out.println( currentRow.text() );; + 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 @@ -284,30 +329,43 @@ int updated = 4; //does not exist on mobile departure.setUpdated(updated); - String trainNumber = "-"; //extractTrainNumberAzure(fields.get(2)); + 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); - String destination = parts[offset++]; + 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 + 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 = ""; //fields.get(6).text().trim(); - extract from url + 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); - departure.setType(typeString); - - departureBean.entries.add( departure ); - } } else { logger.warning("No departures found for station=" + stationcode + ", type=" + traintype); @@ -457,20 +515,31 @@ 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; }