--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/14 06:10:30	1048
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/04 08:27:24	1252
@@ -11,9 +11,11 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import dk.thoerup.android.traininfo.common.DepartureBean;
+import dk.thoerup.android.traininfo.common.DepartureEntry;
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationBean;
 import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
 
@@ -24,6 +26,12 @@
 		REGIONAL
 	}
 	
+	enum FetchTrainType {
+		STOG,
+		REGIONAL,
+		BOTH
+	}
+	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
 	Map<String, DepartureBean> cache;
@@ -42,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();
@@ -59,31 +68,33 @@
 	}
 		
 
-	public DepartureBean lookupDepartures(int stationID, boolean arrival) throws Exception {
+	public DepartureBean lookupDepartures(int stationID, boolean arrival, FetchTrainType type) throws Exception {
 		
 		DepartureBean departureBean = new DepartureBean();
 		
-		StationBean station = stationDao.getById(stationID);
+		StationEntry station = stationDao.getById(stationID);
 		
 		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.departureEntries.addAll( tempBean.departureEntries );
+			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.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}		
 		
-		if (departureBean.departureEntries.size() == 0) {
+		if (departureBean.entries.size() == 0) {
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.departureEntries );
+		if (type == FetchTrainType.BOTH) { //if we have both S-tog and regional order by departure/arrival time 
+			Collections.sort( departureBean.entries );
+		}
 
 		
 		return departureBean;
@@ -143,19 +154,19 @@
 	    if (table != null) {
 		    Elements tableRows =  table.getElementsByTag("tr");
 		    
-		    boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); 
-		    boolean passedTidsstreg = false;
+		    //boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0); 
+		    //boolean passedTidsstreg = false;
 		    
 		    for (Element currentRow : tableRows) {
 		    	String rowClass = currentRow.attr("class");
-		    	
+		    	/*
 		    	if (tidsstregExists == true && passedTidsstreg == false) {
 		    		if (currentRow.getElementsByAttributeValue("class", "Tidsstreg").size() > 0) {
 		    			passedTidsstreg = true;
 		    		} else {
 		    			continue;
 		    		}
-		    	}
+		    	}*/
 		    	
 		    	if (rowClass != null && rowClass.toLowerCase().contains("station") ) {
 		    		
@@ -193,7 +204,7 @@
 		    		
 		    		departure.setType(typeString);
 		    		
-		    		departureBean.departureEntries.add( departure );
+		    		departureBean.entries.add( departure );
 		    	}
 		    }
 	    } else {
@@ -251,19 +262,19 @@
 	    if (table != null) {
 		    Elements tableRows =  table.getElementsByTag("tr");
 		    
-		    boolean passedTidsstreg = false;
-		    boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0);
+		    //boolean passedTidsstreg = false;
+		    //boolean tidsstregExists = (table.getElementsByAttributeValue("class", "Tidsstreg").size() > 0);
 		    
 		    for (Element currentRow : tableRows) {
 		    	String rowClass = currentRow.attr("class");
-		    	
+		    	/*
 		    	if (tidsstregExists == true && passedTidsstreg == false) {
 		    		if (currentRow.getElementsByAttributeValue("class", "Tidsstreg").size() > 0) {
 		    			passedTidsstreg = true;
 		    		} else {
 		    			continue;
 		    		}
-		    	}
+		    	}*/
 		    	
 		    	
 		    	if (rowClass != null && rowClass.toLowerCase().contains("station") ) {
@@ -303,7 +314,7 @@
 		    		
 		    		departure.setType(type);
 		    		
-		    		departureBean.departureEntries.add(departure);
+		    		departureBean.entries.add(departure);
 		    		
 		    		
 		    	}