--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/02 15:06:08	387
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/07 13:37:37	410
@@ -29,11 +29,10 @@
 		List<DepartureBean> list = cache.get(stationID);
 		
 		if (list == null) {
-			logger.warning("Departure: Cache miss " + stationID); //remove before production
 			list = lookupDepartures(stationID);
 			cache.put(stationID, list);
 		} else {
-			logger.warning("Departure: Cache hit " + stationID); //remove before production
+			logger.info("Departure: Cache hit " + stationID); //remove before production
 		}
 		return list;
 	}
@@ -108,7 +107,7 @@
 		    		departure.setUpdated(updated);
 		    		
 		    		String trainNumber = fields.get(2).asText();
-		    		if (trainNumber.trim().length() == 1)
+		    		if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
 		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);