--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 19:59:38	1365
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2011/04/20 20:04:05	1366
@@ -16,6 +16,7 @@
 import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+import dk.thoerup.genericjavautils.HttpUtil;
 import dk.thoerup.genericjavautils.TimeoutMap;
 import dk.thoerup.traininfoservice.Statistics;
 import dk.thoerup.traininfoservice.TraininfoSettings;
@@ -291,16 +292,17 @@
 		    	int updated = 4; //does not exist on mobile
 		    	departure.setUpdated(updated);
 
-		    	String trainNumber = "-"; //extractTrainNumberAzure(fields.get(2));
+		    	String trainNumber = extractTrainNumberMobile(link);
 		    	/*if (traintype == TrainType.STOG) //If it is S-train we need to extract the trainNumber 
 		    		trainNumber = trainNumber + " " + extractTrainNumberAzure(fields.get(2));*/
 		    	departure.setTrainNumber(trainNumber);
 
 				if (traintype == TrainType.STOG) { //if it is stog the next vield is the "Line" code - this should be used somewhere, but skippint ahead for now
-					offset++;
+					String stogLine = parts[offset++].trim();
+					departure.setTrainNumber(stogLine + " " + trainNumber);
 				}
 
-		    	String destination = parts[offset++];
+		    	String destination = parts[offset++].trim();;
 		    	departure.setDestination(destination);
 
 		    	String origin = "-"; // fields.get(4).text(); does not exist on mobile
@@ -321,7 +323,7 @@
 		    		continue;
 		    	}
 
-		    	String status = parts[offset++]; //fields.get(6).text().trim(); - extract from url
+		    	String status = parts[offset++].trim();; //fields.get(6).text().trim(); - extract from url
 		    	departure.setStatus(status);
 
 		    	String note = ""; //extractNote( fields.get(7) ); - extract from url
@@ -476,20 +478,31 @@
 		return number;
 	}
 	
+	private String extractTrainNumberMobile(String link) {
+		Map<String,String> elements = HttpUtil.decodeParams(link);
+		
+		return elements.get("tognummer");
+	}
+	
 	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 argstring = href.split("?")[1];
+		Map<String,String> elements = HttpUtil.decodeParams(argstring);
+		number = elements.get("TogNr");		
 		
+		
+		/*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;
 	}