--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/09/11 07:13:46	313
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/09/28 19:14:18	349
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Logger;
 
 import com.gargoylesoftware.htmlunit.ProxyConfig;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -16,6 +17,8 @@
 import dk.thoerup.traininfoservice.DBConnection;
 
 public class DepartureFetcher {
+	
+	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 		
 
 	public List<DepartureBean> lookupDepartures(int stationID) throws Exception {
@@ -67,41 +70,48 @@
 	    final HtmlPage page = webClient.getPage("http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode);
 	    
 	    HtmlElement table = page.getElementById("afgangtabel");
-	    DomNodeList<HtmlElement> tableRows =  table.getElementsByTagName("tr");
 	    
-	    for (HtmlElement currentRow : tableRows) {
-	    	String rowClass = currentRow.getAttribute("class");
-	    	if (rowClass != null && rowClass.toLowerCase().contains("station") ) {
-	    		DomNodeList<HtmlElement> fields = currentRow.getElementsByTagName("td");
-
-	    		DepartureBean departure = new DepartureBean();
-	    		
-	    		String time = fields.get(0).asText();
-	    		departure.setTime(time);
-	    		
-	    		int updated = extractUpdated( fields.get(1) );
-	    		departure.setUpdated(updated);
-	    		
-	    		String trainNumber = fields.get(2).asText();
-	    		departure.setTrainNumber(trainNumber);
-	    		
-	    		String destination = fields.get(3).asText();
-	    		departure.setDestination(destination);
-	    		
-	    		String origin = fields.get(4).asText();
-	    		departure.setOrigin(origin);
-	    		
-	    		String location = fields.get(5).asText();
-	    		departure.setLocation(location);
-	    		
-	    		String status = fields.get(6).asText();
-	    		departure.setStatus(status);
-	    		
-	    		String note = extractNote( fields.get(7) );
-	    		departure.setNote(note);
-	    		
-	    		departureList.add(departure);
-	    	}
+	    if (table != null) {
+		    DomNodeList<HtmlElement> tableRows =  table.getElementsByTagName("tr");
+		    
+		    for (HtmlElement currentRow : tableRows) {
+		    	String rowClass = currentRow.getAttribute("class");
+		    	if (rowClass != null && rowClass.toLowerCase().contains("station") ) {
+		    		DomNodeList<HtmlElement> fields = currentRow.getElementsByTagName("td");
+	
+		    		DepartureBean departure = new DepartureBean();
+		    		
+		    		String time = fields.get(0).asText();
+		    		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();
+		    		departure.setDestination(destination);
+		    		
+		    		String origin = fields.get(4).asText();
+		    		departure.setOrigin(origin);
+		    		
+		    		String location = fields.get(5).asText();
+		    		departure.setLocation(location);
+		    		
+		    		String status = fields.get(6).asText();
+		    		departure.setStatus(status);
+		    		
+		    		String note = extractNote( fields.get(7) );
+		    		departure.setNote(note);
+		    		
+		    		departureList.add(departure);
+		    	}
+		    }
+	    } else {
+	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
 	    }
 	    
 	    return departureList;
@@ -135,6 +145,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();