--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlDepartureProvider.java 2011/03/31 17:13:19 1248 +++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlDepartureProvider.java 2011/03/31 17:39:20 1249 @@ -22,14 +22,14 @@ @Override - public DepartureBean lookupDepartures(int stationID, boolean arrival) { + public DepartureBean lookupDepartures(int stationID, boolean arrival,String type) { - String key = "" + stationID + ":" + arrival; + String key = "" + stationID + ":" + arrival + ":" + type; DepartureBean departures = departureCache.get(key); if (departures == null) { - departures = lookupDeparturesWorker(stationID, arrival); + departures = lookupDeparturesWorker(stationID, arrival, type); if (departures != null) { departureCache.put(key, departures); @@ -42,12 +42,12 @@ return departures; } - private DepartureBean lookupDeparturesWorker(int stationID, boolean arrival) { + private DepartureBean lookupDeparturesWorker(int stationID, boolean arrival, String type) { try { int iArrival = arrival ? 1 : 0; - String url = XmlUtil.SERVICE_BASE + "/DepartureServlet?format=xml&station=" + stationID + "&arrival=" + iArrival; + String url = XmlUtil.SERVICE_BASE + "/DepartureServlet?format=xml&station=" + stationID + "&arrival=" + iArrival + "&type=" + type; Log.i("xmlurl",url); String doc = DownloadUtil.getContentString(url, 30000, "ISO-8859-1");