--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 18:57:18	1354
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 19:01:33	1355
@@ -16,6 +16,7 @@
 import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+import dk.thoerup.genericjavautils.TimeoutMap;
 import dk.thoerup.traininfoservice.Statistics;
 import dk.thoerup.traininfoservice.TraininfoSettings;
 import dk.thoerup.traininfoservice.db.StationDAO;
@@ -262,14 +263,20 @@
 		    	}
 		    	
 		    	
-		    	Element link = currentRow.child(0);	
+		    	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
@@ -301,17 +308,25 @@
 
 		    	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++]; //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);