--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/07/09 21:02:13	969
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/07/09 21:23:48	970
@@ -59,12 +59,12 @@
 		StationBean station = stationDao.getById(stationID);
 		
 		if (station.getRegional() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getRegional(), "FJRN", arrival);
+			List<DepartureBean> list = lookupDepartures(station.getRegional(), "Fjerntog", arrival);
 			departureList.addAll(list);			
 		}
 		
 		if (station.getStrain() != null) {
-			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S2", arrival);
+			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S-Tog", arrival);
 			departureList.addAll(list);	
 		}		
 		
@@ -89,8 +89,13 @@
 	    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;
+	    //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");
 	    
@@ -118,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);
 		    		
@@ -246,18 +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;