--- 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 11:09:55	1051
@@ -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");
@@ -102,15 +103,12 @@
 				
 		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;
 	}