--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/03/30 19:52:31	1247
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/03/31 17:13:19	1248
@@ -26,6 +26,12 @@
 		REGIONAL
 	}
 	
+	enum FetchTrainType {
+		STOG,
+		REGIONAL,
+		BOTH
+	}
+	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
 	Map<String, DepartureBean> cache;
@@ -44,14 +50,15 @@
 	
 		
 	
-	public DepartureBean cachedLookupDepartures(int stationID, boolean arrival) throws Exception {
-		final String key = "" + stationID + ":" + arrival;
+	public DepartureBean cachedLookupDepartures(int stationID, boolean arrival, FetchTrainType type) throws Exception {
+		
+		final String key = "" + stationID + ":" + arrival + ":" + type.toString();
 		
 		DepartureBean departureBean = cache.get(key);
 
 		
 		if (departureBean == null) {
-			departureBean = lookupDepartures(stationID,arrival);
+			departureBean = lookupDepartures(stationID, arrival, type);
 			cache.put(key, departureBean);
 		} else {
 			Statistics.getInstance().incrementDepartureCacheHits();
@@ -61,7 +68,7 @@
 	}
 		
 
-	public DepartureBean lookupDepartures(int stationID, boolean arrival) throws Exception {
+	public DepartureBean lookupDepartures(int stationID, boolean arrival, FetchTrainType type) throws Exception {
 		
 		DepartureBean departureBean = new DepartureBean();
 		
@@ -69,13 +76,13 @@
 		
 		departureBean.stationName = station.getName();
 		
-		if (station.getRegional() != null) {
+		if (station.getRegional() != null && (type == FetchTrainType.REGIONAL||type == FetchTrainType.BOTH) ) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
 			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}
 		
-		if (station.getStrain() != null) {
+		if (station.getStrain() != null && (type == FetchTrainType.STOG||type == FetchTrainType.BOTH)) {
 			DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival);
 			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);