--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/13 18:53:30	1043
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/14 17:01:24	1056
@@ -62,6 +62,7 @@
 			
 		
 		URL url = new URL("http://www.m.dk/layouts/Metro/Widgets/MetroWidget.ashx?StationId=" + station.getMetro() + "&Congestion=true&Application=MyMetro&Expiration=true");
+		logger.fine("URL:" + url);
 		
 	    JsoupInvocation wrapper = new JsoupInvocation( url, 3000);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("metro");
@@ -82,35 +83,41 @@
 		for (int i=1; i<rows.size(); i++) {
 			Element row = rows.get(i);	
 			Elements fields = row.children();
+
+			
+			
+			Elements metroFields = fields.get(0).children();			
+			String metro ="";			
+			for (Element elm : metroFields) {
+				metro = metro + elm.text() + " ";
+			}
+			
+			
 			
-			String metro = fields.get(0).text();
 			String destination = fields.get(1).text();
-			Elements minuteFields = fields.get(2).children();
-			String minutes ="";
 			
+			Elements minuteFields = fields.get(2).children();			
+			String minutes ="";			
 			for (Element elm : minuteFields) {
 				minutes = minutes + elm.text() + " ";
 			}
 			
 			MetroEntry entry = new MetroEntry();
-			entry.metro = metro;
-			entry.destination = destination;
-			entry.minutes = minutes;
+			entry.metro = metro.trim();
+			entry.destination = destination.trim();
+			entry.minutes = minutes.trim();
 			
 			bean.entries.add(entry);			
 		}
 				
 		bean.operationInfo = contentElems.get(3).text();
 		
-		int planIndex;
-		if (contentElems.get(4).text().trim().equalsIgnoreCase("stationsinformation")) {
-			planIndex = 7;
-		} else {
-			planIndex = 5;
+		for (int i=4; i<contentElems.size(); i++) {
+			if (contentElems.get(i).text().trim().equalsIgnoreCase("køreplan")) {				
+				bean.plan = contentElems.get(i+1).text();
+			}
 		}
-			
-		bean.plan = contentElems.get(planIndex).text();
-		
+
 		return bean;
 	}