--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/08 10:23:44	1033
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/08 12:31:55	1034
@@ -30,12 +30,12 @@
 	
 	StationDAO stationDao = new StationDAO();
 	
-	private boolean useTempSite;
+	private boolean useAzureSite;
 	private int replyTimeout;
 	
-	public DepartureFetcher(boolean tempSite, int cacheTimeout, int replyTimeout) {
+	public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) {
 		this.replyTimeout = replyTimeout;
-		useTempSite = tempSite;
+		useAzureSite = azureSite;
 		cache = new TimeoutMap<String,DepartureBean>(cacheTimeout);
 	}
 	
@@ -86,16 +86,14 @@
 	}
 	
 	public DepartureBean lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception {
-		if (useTempSite == false) {
-			return lookupDeparturesNormalSite(stationcode, type, arrival);
-		} else {
-			//return lookupDeparturesFromTemporarySite(stationcode, type);
-			//TODO: find out what to to if they ever put a temp site up on trafikinfo.bane.dk 
-			return null;
+		if (useAzureSite == true) {
+			return lookupDeparturesAzureSite(stationcode, type, arrival);
+		} else { 
+			return lookupDeparturesWwwSite(stationcode, type, arrival);
 		}
 	}
 	
-	private String getTypeString(TrainType type) {
+	private String getTypeStringAzure(TrainType type) {
 		switch (type) {
 		case STOG:
 			return "S-Tog";
@@ -106,19 +104,28 @@
 		}
 	}
 	
-	public DepartureBean lookupDeparturesNormalSite(String stationcode, TrainType type, boolean arrival) throws Exception {
+	private String getTypeStringWww(TrainType type) {
+		switch (type) {
+		case STOG:
+			return "S2";
+		case REGIONAL:
+			return "FJRN";
+		default:
+			return ""; //Can not happen
+		}
+	}
+	
+	public DepartureBean lookupDeparturesAzureSite(String stationcode, TrainType type, boolean arrival) throws Exception {
 		
 		DepartureBean departureBean = new DepartureBean();
 		 
 	    
-	    String typeString = getTypeString(type);
+	    String typeString = getTypeStringAzure(type);
 	    String arrivalDeparture = (arrival==false) ? "Afgang" : "Ankomst"; 
 	    
 	    stationcode = URLEncoder.encode(stationcode,"ISO-8859-1");
-	    //String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
-	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";
 
-	    
+	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
 	    
 	    //logger.info("URI: " + uri);	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
@@ -207,74 +214,80 @@
 	    return departureBean;
 	}
 	
-	/*
-	@Deprecated
-	public List<DepartureBean> lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception {
+	public DepartureBean lookupDeparturesWwwSite(String stationcode, TrainType trainType, boolean arrival) throws Exception {
 		
-		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
+		DepartureBean departureBean = new DepartureBean();
 		
-	    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;
-	    
-	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri);
+		String type = getTypeStringWww(trainType);
+		
+			 	    	    
+	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
-	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
+	    Element page = (Element) breaker.invoke(wrapper);
 	    
-	    HtmlElement table = page.getElementById("traf_afgang");
+	    String tableName = arrival == false ? "afgangtabel" : "ankomsttabel";
+	    Element table = page.getElementById(tableName);
 	    
-	    if (table != null) {		    	
-		    DomNodeList<HtmlElement> tableRows =  table.getElementsByTagName("tr");
-		    
-		    boolean isFirst = true;
+	    if (table != null) {
+		    Elements tableRows =  table.getElementsByTag("tr");
 		    
-		    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);
+		    for (Element currentRow : tableRows) {
+		    	String rowClass = currentRow.attr("class");
+		    	if (rowClass != null && rowClass.toLowerCase().contains("station") ) {
+		    		Elements fields = currentRow.getElementsByTag("td");
+	
+		    		DepartureEntry departure = new DepartureEntry();
+		    		
 
-		    	departureList.add(departure);
+		    		
+		    		String time = fields.get(0).getAllElements().get(2).text();
+		    		if (time.equals(""))
+		    			time = "0:00"; //Bane.dk bug work-around
+		    		departure.setTime(time);
+		    		logger.info("Time: " + time);// TODO: remove
+		    		
+		    		int updated = extractUpdated( fields.get(1) );
+		    		departure.setUpdated(updated);
+		    		logger.info("Updated: " + updated);// TODO: remove
+		    		
+		    		String trainNumber = fields.get(2).text();
+		    		if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
+		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
+		    		departure.setTrainNumber(trainNumber);
+		    		logger.info("TrainNumber: " + trainNumber);// TODO: remove
+		    		
+		    		String destination = fields.get(3).text();
+		    		departure.setDestination(destination);
+		    		
+		    		String origin = fields.get(4).text();
+		    		departure.setOrigin(origin);
+		    		
+		    		String location = fields.get(5).text();
+		    		departure.setLocation(location);
+		    		
+		    		String status = fields.get(6).text().trim();
+		    		departure.setStatus(status);
+		    		
+		    		String note = extractNote( fields.get(7) );
+		    		departure.setNote(note);
+		    		
+		    		departure.setType(type);
+		    		
+		    		departureBean.departureEntries.add(departure);
+		    		
+		    		
+		    	}
 		    }
 	    } else {
 	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
 	    }
-	    webClient.closeAllWindows();
 	    
 	    
-	    return departureList;
-	}*/
-
+	    return departureBean;
+	}
+		
 	
 	private int extractUpdated(Element updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" 
 		int updated = -1;