--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/06/11 20:50:40	842
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/07/10 08:35:16	975
@@ -90,8 +90,8 @@
 	List<TimetableBean> lookupTimetableRealSite(String trainID, String type) throws Exception {		
 		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
 		
-		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";
+		String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID;			
 
 	    final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
 	    webClient.setTimeout(2500);
@@ -100,7 +100,7 @@
 	    webClient.setCssEnabled(false);
 	    
 	    
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, url);
+	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, url);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
@@ -137,6 +137,9 @@
 	    		bean.setArrival( fields.get(1).asText() );
 	    		bean.setDeparture( fields.get(2).asText() );
 	    		
+	    		boolean cancelled = fields.get(3).asText().equalsIgnoreCase("aflyst");
+	    		bean.setCancelled(cancelled);
+	    		
 	    		if (currentStation == true && currentStationSaved == false ) {
 	    			bean.setCurrent(currentStation);
 	    			currentStationSaved = true;
@@ -145,7 +148,26 @@
 	    		bean.setStationId( getStationId( station ));
 	    		
 	    		timetableList.add(bean);
-
+	    	}
+	    	
+	    	final String cancelledString = "Aflyst";
+	    	for (int i=0;i<timetableList.size(); i++) { //handle cancelled labels
+	    		final int lastIdx = (timetableList.size() - 1);
+	    		
+	    		TimetableBean current = timetableList.get(i);
+	    		if (current.isCancelled() && i == 0) {
+	    			current.setDeparture(cancelledString);
+	    		} else if (current.isCancelled() && i == lastIdx) {
+	    			current.setArrival(cancelledString);
+	    		} else if (current.isCancelled() && i>0 && i<lastIdx) {
+	    			TimetableBean next = timetableList.get(i+1);
+	    			TimetableBean prev = timetableList.get(i-1);
+	    			
+	    			if (next.isCancelled())
+	    				current.setDeparture(cancelledString);
+	    			if (prev.isCancelled())
+	    				current.setArrival(cancelledString);
+	    		}
 	    	}
 	    	
 	    } else {