--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/09/10 18:13:52	308
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/09/24 20:20:49	342
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.gargoylesoftware.htmlunit.ProxyConfig;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -60,48 +61,51 @@
 		
 	    final WebClient webClient = new WebClient();
 	    webClient.setTimeout(1000);
-	    webClient.setJavaScriptEnabled(false); 
+	    webClient.setJavaScriptEnabled(false);
+	    	    	    
 	    
 	    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 = fields.get(7).asText();
-	    		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();
+		    		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);
+		    	}
+		    }
 	    }
-	    
 	    return departureList;
 	}
 	
@@ -123,6 +127,16 @@
 		return updated;
 	}
 	
+	private String extractNote(HtmlElement noteTd) {
+		String note = noteTd.asText().trim();
+		
+		List<HtmlElement> elems = noteTd.getElementsByAttribute("span", "class", "bemtype");
+		if (elems.size() > 0 && note.charAt(note.length()-1) == 'i')
+			note = note.substring(0,note.length() -1 );
+
+		return note;
+	}
+	
 	//test
 	public static void main(String args[]) throws Exception{
 		DepartureFetcher f = new DepartureFetcher();