--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/06/10 22:26:09	829
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/07/09 22:30:18	974
@@ -20,6 +20,11 @@
 
 public class DepartureFetcher {
 	
+	enum TrainType{
+		STOG,
+		REGIONAL
+	}
+	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
 	Map<String, List<DepartureBean>> cache;
@@ -59,12 +64,12 @@
 		StationBean station = stationDao.getById(stationID);
 		
 		if (station.getRegional() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getRegional(), "FJRN", arrival);
+			List<DepartureBean> list = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
 			departureList.addAll(list);			
 		}
 		
 		if (station.getStrain() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S2", arrival);
+			List<DepartureBean> list = lookupDepartures(station.getStrain(), TrainType.STOG, arrival);
 			departureList.addAll(list);	
 		}		
 		
@@ -74,33 +79,49 @@
 		return departureList;
 	}
 	
-	public List<DepartureBean> lookupDepartures(String stationcode, String type, boolean arrival) throws Exception {
+	public List<DepartureBean> lookupDepartures(String stationcode, TrainType type, boolean arrival) throws Exception {
 		if (useTempSite == false) {
 			return lookupDeparturesNormalSite(stationcode, type, arrival);
 		} else {
-			return lookupDeparturesFromTemporarySite(stationcode, type);
+			//return lookupDeparturesFromTemporarySite(stationcode, type);
+			//TODO: find out what to to if they ever put a temp site up on trafikinfo.bane.dk 
+			return null;
 		}
 	}
 	
-	public List<DepartureBean> lookupDeparturesNormalSite(String stationcode, String type, boolean arrival) throws Exception {
+	private String getTypeString(TrainType type) {
+		switch (type) {
+		case STOG:
+			return "S-Tog";
+		case REGIONAL:
+			return "Fjerntog";
+		default:
+			return ""; //Can not happen
+		}
+	}
+	
+	public List<DepartureBean> lookupDeparturesNormalSite(String stationcode, TrainType type, boolean arrival) throws Exception {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
 	    final WebClient webClient = new WebClient( BrowserVersion.FIREFOX_3 );
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
+	    
+	    
+	    String typeString = getTypeString(type);
+	    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 + "/" + typeString + "/UdvidetVisning";
+
+	    //logger.info("URI: " + uri);
+	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, uri);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
 	    
 	    String tableName = arrival == false ? "afgangtabel" : "ankomsttabel";
-	    
-	    System.out.println(uri);
-	    System.out.println(tableName);
-	    
 	    HtmlElement table = page.getElementById(tableName);
 	    
 	    if (table != null) {
@@ -122,7 +143,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 == TrainType.STOG) //If it is S-train we need to extract the trainNumber 
 		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
@@ -135,13 +156,13 @@
 		    		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);
+		    		departure.setType(typeString);
 		    		
 		    		departureList.add(departure);
 		    	}
@@ -154,6 +175,8 @@
 	    return departureList;
 	}
 	
+	/*
+	@Deprecated
 	public List<DepartureBean> lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
@@ -165,7 +188,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);
@@ -218,7 +241,7 @@
 	    
 	    
 	    return departureList;
-	}
+	}*/
 
 	
 	private int extractUpdated(HtmlElement updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" 
@@ -250,19 +273,11 @@
 	}
 	
 	private String extractTrainNumber(HtmlElement trainTd) {
-		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 pair[] = arg.split("="); // Key=pair[0], Value=pair[1]
-			
-			if (pair[0].equalsIgnoreCase("TogNr"))
-				number = pair[1];
-		}
 		
+		int pos = href.lastIndexOf('/');
+		String number = href.substring(pos+1);
 		
 		return number;
 	}