--- 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	2010/02/02 19:18:20	583
@@ -6,21 +6,30 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
-
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import dk.thoerup.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 import dk.thoerup.traininfoservice.DBConnection;
 
 public class DepartureFetcher {
 	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
-	TimeoutCache<Integer, List<DepartureBean>> cache = new TimeoutCache<Integer,List<DepartureBean>>(120 * 1000);
+	Map<Integer, List<DepartureBean>> cache = new TimeoutMap<Integer,List<DepartureBean>>(120 * 1000);
+	
+	private boolean useTempSite;
+	
+	public DepartureFetcher(boolean tempSite) {
+		useTempSite = tempSite;
+	}
+	
 	
 		
 	
@@ -29,11 +38,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;
 	}
@@ -77,6 +85,14 @@
 	}
 	
 	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Exception {
+		if (useTempSite == false) {
+			return lookupDeparturesNormalSite(stationcode, type);
+		} else {
+			return lookupDeparturesFromTemporarySite(stationcode, type);
+		}
+	}
+	
+	public List<DepartureBean> lookupDeparturesNormalSite(String stationcode, String type) throws Exception {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
@@ -84,8 +100,11 @@
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
+	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
-	    final HtmlPage page = webClient.getPage("http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode);
+	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
 	    
 	    HtmlElement table = page.getElementById("afgangtabel");
 	    
@@ -108,7 +127,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);
 		    		
@@ -137,6 +156,71 @@
 	    return departureList;
 	}
 	
+	public List<DepartureBean> lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception {
+		
+		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
+		
+	    final WebClient webClient = new WebClient();
+	    webClient.setTimeout(2500);
+	    webClient.setJavaScriptEnabled(false);
+	    
+
+	    String uri = "http://bane.dk/lite/station.asp?w=" + type + "&s=" + stationcode;
+	    
+	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
+	    
+	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
+	    
+	    HtmlElement table = page.getElementById("traf_afgang");
+	    
+	    if (table != null) {		    	
+		    DomNodeList<HtmlElement> tableRows =  table.getElementsByTagName("tr");
+		    
+		    boolean isFirst = true;
+		    
+		    for (HtmlElement currentRow : tableRows) {
+		    	if (isFirst == true) { //skip table headers
+		    		isFirst = false;
+		    		continue;
+		    	}
+		    	
+		    	DomNodeList<HtmlElement> fields = currentRow.getElementsByTagName("td");
+
+		    	DepartureBean departure = new DepartureBean();
+
+		    	String time = fields.get(0).asText().trim();
+
+		    	if (time.equals(""))
+		    		time = "0:00"; //Bane.dk bug work-around
+		    	departure.setTime(time);
+
+
+		    	String trainNumber = fields.get(1).asText();
+		    	departure.setTrainNumber(trainNumber);
+
+		    	String destination = fields.get(2).asText();
+		    	departure.setDestination(destination);
+
+		    	String origin = fields.get(3).asText();
+		    	departure.setOrigin(origin);
+
+		    	String status = fields.get(4).asText();
+		    	departure.setStatus(status);
+
+		    	String note = fields.get(5).asText();
+		    	departure.setNote(note);
+
+		    	departureList.add(departure);
+		    }
+	    } else {
+	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
+	    }
+	    
+	    return departureList;
+	}
+
+	
 	private int extractUpdated(HtmlElement updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" 
 		int updated = -1;
 		
@@ -185,7 +269,8 @@
 	}
 	
 	//test
-	public static void main(String args[]) throws Exception{
+	/*
+	public static void main(String args[]) throws Exception {
 		DepartureFetcher f = new DepartureFetcher();
 		List<DepartureBean> deps = f.lookupDepartures("AR", "FJRN");
 		for(DepartureBean d : deps) {
@@ -194,5 +279,5 @@
 		}
 		
 		System.out.println("--------------------------");
-	}
+	}*/
 }