--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/10 14:07:04	591
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/06/28 12:35:35	939
@@ -16,12 +16,13 @@
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 import dk.thoerup.traininfoservice.StationBean;
 import dk.thoerup.traininfoservice.StationDAO;
+import dk.thoerup.traininfoservice.Statistics;
 
 public class DepartureFetcher {
 	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
-	Map<Integer, List<DepartureBean>> cache;
+	Map<String, List<DepartureBean>> cache;
 	
 	StationDAO stationDao = new StationDAO();
 	
@@ -29,38 +30,41 @@
 	
 	public DepartureFetcher(boolean tempSite, int cacheTimeout) {
 		useTempSite = tempSite;
-		cache = new TimeoutMap<Integer,List<DepartureBean>>(cacheTimeout);
+		cache = new TimeoutMap<String,List<DepartureBean>>(cacheTimeout);
 	}
 	
 	
 		
 	
-	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Exception {
+	public List<DepartureBean> cachedLookupDepartures(int stationID, boolean arrival) throws Exception {
+		final String key = "" + stationID + ":" + arrival;
+		
+		List<DepartureBean> list = cache.get(key);
 
-		List<DepartureBean> list = cache.get(stationID);
 		
 		if (list == null) {
-			list = lookupDepartures(stationID);
-			cache.put(stationID, list);
+			list = lookupDepartures(stationID,arrival);
+			cache.put(key, list);
 		} else {
-			logger.info("Departure: Cache hit " + stationID); //remove before production
+			Statistics.getInstance().incrementDepartureCacheHits();
+			logger.info("Departure: Cache hit " + key); //remove before production
 		}
 		return list;
 	}
 		
 
-	public List<DepartureBean> lookupDepartures(int stationID) throws Exception {
+	public List<DepartureBean> lookupDepartures(int stationID, boolean arrival) throws Exception {
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
 		StationBean station = stationDao.getById(stationID);
 		
 		if (station.getRegional() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getRegional(), "FJRN");
+			List<DepartureBean> list = lookupDepartures(station.getRegional(), "FJRN", arrival);
 			departureList.addAll(list);			
 		}
 		
 		if (station.getStrain() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S2");
+			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S2", arrival);
 			departureList.addAll(list);	
 		}		
 		
@@ -70,15 +74,15 @@
 		return departureList;
 	}
 	
-	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Exception {
+	public List<DepartureBean> lookupDepartures(String stationcode, String type, boolean arrival) throws Exception {
 		if (useTempSite == false) {
-			return lookupDeparturesNormalSite(stationcode, type);
+			return lookupDeparturesNormalSite(stationcode, type, arrival);
 		} else {
 			return lookupDeparturesFromTemporarySite(stationcode, type);
 		}
 	}
 	
-	public List<DepartureBean> lookupDeparturesNormalSite(String stationcode, String type) throws Exception {
+	public List<DepartureBean> lookupDeparturesNormalSite(String stationcode, String type, boolean arrival) throws Exception {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
@@ -87,12 +91,13 @@
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
 	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
 	    
-	    HtmlElement table = page.getElementById("afgangtabel");
+	    String tableName = arrival == false ? "afgangtabel" : "ankomsttabel";
+	    HtmlElement table = page.getElementById(tableName);
 	    
 	    if (table != null) {
 		    DomNodeList<HtmlElement> tableRows =  table.getElementsByTagName("tr");
@@ -126,12 +131,14 @@
 		    		String location = fields.get(5).asText();
 		    		departure.setLocation(location);
 		    		
-		    		String status = fields.get(6).asText();
+		    		String status = fields.get(6).asText().trim();
 		    		departure.setStatus(status);
 		    		
 		    		String note = extractNote( fields.get(7) );
 		    		departure.setNote(note);
 		    		
+		    		departure.setType(type);
+		    		
 		    		departureList.add(departure);
 		    	}
 		    }
@@ -154,7 +161,7 @@
 
 	    String uri = "http://bane.dk/lite/station.asp?w=" + type + "&s=" + stationcode;
 	    
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);