84 |
List<TimetableBean> lookupTimetableAzureSite(String trainID, String type) throws Exception { |
List<TimetableBean> lookupTimetableAzureSite(String trainID, String type) throws Exception { |
85 |
List<TimetableBean> timetableList = new ArrayList<TimetableBean>(); |
List<TimetableBean> timetableList = new ArrayList<TimetableBean>(); |
86 |
|
|
|
//String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276"; |
|
|
String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID; |
|
87 |
|
|
88 |
|
String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID; |
89 |
|
logger.fine("URL:" + url); |
90 |
|
|
91 |
JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout); |
JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout); |
92 |
CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); |
CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk"); |
175 |
List<TimetableBean> timetableList = new ArrayList<TimetableBean>(); |
List<TimetableBean> timetableList = new ArrayList<TimetableBean>(); |
176 |
|
|
177 |
String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276"; |
String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276"; |
178 |
|
logger.fine("URL:" + url); |
179 |
|
|
180 |
|
|
181 |
JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout); |
JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout); |
209 |
|
|
210 |
TimetableBean bean = new TimetableBean(); |
TimetableBean bean = new TimetableBean(); |
211 |
|
|
212 |
String station = fields.get(0).text() ; |
String station = DepartureFetcher.cleanText( fields.get(0).text() ) ; |
213 |
if (station.equals("København")) |
if (station.equals("København")) |
214 |
station = "København H"; //correct inconsistency in naming |
station = "København H"; //correct inconsistency in naming |
215 |
|
|
216 |
|
String arrival = DepartureFetcher.cleanText( fields.get(1).text() ); |
217 |
|
String departure = DepartureFetcher.cleanText( fields.get(2).text() ); |
218 |
|
|
219 |
bean.setStation( station ); |
bean.setStation( station ); |
220 |
bean.setArrival( fields.get(1).text() ); |
bean.setArrival( arrival ); |
221 |
bean.setDeparture( fields.get(2).text() ); |
bean.setDeparture( departure ); |
222 |
|
|
223 |
|
|
224 |
if (currentStation == true && currentStationSaved == false ) { |
if (currentStation == true && currentStationSaved == false ) { |