--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/08 19:12:15	588
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/07/09 21:23:48	970
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -15,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();
 	
@@ -28,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(), "Fjerntog", arrival);
 			departureList.addAll(list);			
 		}
 		
 		if (station.getStrain() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S2");
+			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S-Tog", arrival);
 			departureList.addAll(list);	
 		}		
 		
@@ -69,29 +74,35 @@
 		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>();
 		
-	    final WebClient webClient = new WebClient();
+	    final WebClient webClient = new WebClient( BrowserVersion.FIREFOX_3 );
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
+	    
+	    String arrivalDeparture = (arrival==false) ? "Afgang" : "Ankomst"; 
 	    	    	    
-	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    //String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" +type + "/UdvidetVisning";
+
+	    logger.info("URI: " + 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");
@@ -112,7 +123,7 @@
 		    		departure.setUpdated(updated);
 		    		
 		    		String trainNumber = fields.get(2).asText();
-		    		if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
+		    		if (type.equalsIgnoreCase("S-Tog")) //If it is S-train we need to extract the trainNumber 
 		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
@@ -125,18 +136,21 @@
 		    		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);
 		    	}
 		    }
 	    } else {
 	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
 	    }
+	    webClient.closeAllWindows();
 	    
 	    return departureList;
 	}
@@ -145,14 +159,14 @@
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
-	    final WebClient webClient = new WebClient();
+	    final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    
 
 	    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);
@@ -201,6 +215,8 @@
 	    } else {
 	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
 	    }
+	    webClient.closeAllWindows();
+	    
 	    
 	    return departureList;
 	}
@@ -235,19 +251,21 @@
 	}
 	
 	private String extractTrainNumber(HtmlElement trainTd) {
+		logger.info("Extract traininfo " + trainTd.toString() );
 		String number = "";
 		HtmlElement anchorElement = trainTd.getElementsByTagName("a").get(0);
 		String href = anchorElement.getAttribute("href");
 		String argstring = href.substring( href.indexOf('?') + 1);
 		
-		String args[] = argstring.split("&");
-		for (String arg : args) {
+		String args[] = argstring.split("/");
+		number = args[args.length-1];
+		
+		/*for (String arg : args) {
 			String pair[] = arg.split("="); // Key=pair[0], Value=pair[1]
 			
 			if (pair[0].equalsIgnoreCase("TogNr"))
 				number = pair[1];
-		}
-		
+		}*/
 		
 		
 		return number;