--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/02 08:52:45	579
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/02 18:42:38	580
@@ -24,6 +24,13 @@
 	
 	Map<Integer, List<DepartureBean>> cache = new TimeoutMap<Integer,List<DepartureBean>>(120 * 1000);
 	
+	private boolean useTempSite;
+	
+	public DepartureFetcher(boolean tempSite) {
+		useTempSite = tempSite;
+	}
+	
+	
 		
 	
 	public List<DepartureBean> cachedLookupDepartures(int stationID) throws Exception {
@@ -78,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>();
 		
@@ -141,6 +156,73 @@
 	    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();
+		    	logger.info("time:" + time);
+		    	if (time.equals(""))
+		    		time = "0:00"; //Bane.dk bug work-around
+		    	departure.setTime(time);
+
+
+		    	String trainNumber = fields.get(1).asText();
+		    	if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
+		    		trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
+		    	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 = extractNote( fields.get(5) );
+		    	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;
 		
@@ -189,6 +271,7 @@
 	}
 	
 	//test
+	/*
 	public static void main(String args[]) throws Exception {
 		DepartureFetcher f = new DepartureFetcher();
 		List<DepartureBean> deps = f.lookupDepartures("AR", "FJRN");
@@ -198,5 +281,5 @@
 		}
 		
 		System.out.println("--------------------------");
-	}
+	}*/
 }