--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/12 18:41:17	1038
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/14 05:20:17	1045
@@ -173,7 +173,7 @@
 		    		
 		    		String trainNumber = fields.get(2).text();
 		    		if (type == TrainType.STOG) //If it is S-train we need to extract the trainNumber 
-		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
+		    			trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
 		    		String destination = fields.get(3).text();
@@ -220,8 +220,8 @@
 	
 	
 	
-	String cleanText(String input) {
-		//apparently JSoup interprets some of space characters on www.bane.dk as 0xA0 
+	public static String cleanText(String input) {
+		//apparently JSoup translates   characters on www.bane.dk to 0xA0 
 		return input.replace((char) 0xA0, (char)0x20).trim();
 	}
 	
@@ -231,8 +231,11 @@
 		
 		String type = getTypeStringWww(trainType);
 		
+		stationcode = URLEncoder.encode(stationcode, "ISO-8859-1"); 
+		
 			 	    	    
 	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    logger.info("URI:" + uri);
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
@@ -263,7 +266,7 @@
 		    		
 		    		String trainNumber = cleanText( 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));
+		    			trainNumber = trainNumber + " " + extractTrainNumberWww(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
 		    		String destination = cleanText( fields.get(3).text() );
@@ -326,7 +329,7 @@
 		return note.trim();
 	}
 	
-	private String extractTrainNumber(Element trainTd) {
+	private String extractTrainNumberAzure(Element trainTd) {
 		Element anchorElement = trainTd.getElementsByTag("a").get(0);
 		String href = anchorElement.attr("href");
 		
@@ -336,6 +339,25 @@
 		return number;
 	}
 	
+	private String extractTrainNumberWww(Element trainTd) {
+		String number = "";
+		Element anchorElement = trainTd.getElementsByTag("a").get(0);
+		String href = anchorElement.attr("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];
+		}
+		
+		
+		return number;
+	}
+
+	
 	//test
 	/*
 	public static void main(String args[]) throws Exception {