--- 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/06/28 12:35:35	939
@@ -91,16 +91,12 @@
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
 	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&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);
 	    
 	    String tableName = arrival == false ? "afgangtabel" : "ankomsttabel";
-	    
-	    System.out.println(uri);
-	    System.out.println(tableName);
-	    
 	    HtmlElement table = page.getElementById(tableName);
 	    
 	    if (table != null) {
@@ -135,7 +131,7 @@
 		    		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) );
@@ -165,7 +161,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);