--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/07/09 21:23:48	970
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/07/10 09:57:04	977
@@ -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,29 @@
 	    		bean.setStationId( getStationId( station ));
 	    		
 	    		timetableList.add(bean);
-
+	    	}
+	    	
+	    	//TODO: There is an off-by-one error in this cancelled parser thingie
+	    	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()) {
+		    		if (i == 0) {
+		    			current.setDeparture(cancelledString);
+		    		} else if (i == lastIdx) {
+		    			current.setArrival(cancelledString);
+		    		} else if (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 {