--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/09/27 19:14:39	348
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/02 13:44:31	386
@@ -63,7 +63,7 @@
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
 	    final WebClient webClient = new WebClient();
-	    webClient.setTimeout(1000);
+	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
 	    
@@ -82,12 +82,16 @@
 		    		DepartureBean departure = new DepartureBean();
 		    		
 		    		String time = fields.get(0).asText();
+		    		if (time.equals(""))
+		    			time = "0:00"; //Bane.dk bug work-around
 		    		departure.setTime(time);
 		    		
 		    		int updated = extractUpdated( fields.get(1) );
 		    		departure.setUpdated(updated);
 		    		
 		    		String trainNumber = fields.get(2).asText();
+		    		if (trainNumber.trim().length() == 1)
+		    			trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    		departure.setTrainNumber(trainNumber);
 		    		
 		    		String destination = fields.get(3).asText();
@@ -143,6 +147,25 @@
 		return note;
 	}
 	
+	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];
+		}
+		
+		
+		
+		return number;
+	}
+	
 	//test
 	public static void main(String args[]) throws Exception{
 		DepartureFetcher f = new DepartureFetcher();