--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/14 11:04:08	1050
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/16 14:04:28	1061
@@ -2,39 +2,24 @@
 
 
 import java.net.URL;
-
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import dk.thoerup.android.traininfo.common.MetroBean;
+import dk.thoerup.android.traininfo.common.MetroBean.MetroEntry;
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationBean;
 import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
 
 
 
 public class MetroFetcher {
-	public static class MetroEntry {
-		String metro;
-		String destination;
-		String minutes;		
-	}
-	
-	public static class MetroBean {
-		String head;
-		String operationInfo; //driftsinfo
-		String plan; // koereplan
-		
-		List<MetroEntry> entries = new ArrayList<MetroEntry>();
-	}
 	
 	Logger logger = Logger.getLogger(MetroFetcher.class.getName());
 	StationDAO stationDAO = new StationDAO();
@@ -58,7 +43,7 @@
 
 	public MetroBean lookupMetroDepartures(int stationID) throws Exception {
 		
-		StationBean station = stationDAO.getById(stationID) ;
+		StationEntry station = stationDAO.getById(stationID) ;
 			
 		
 		URL url = new URL("http://www.m.dk/layouts/Metro/Widgets/MetroWidget.ashx?StationId=" + station.getMetro() + "&Congestion=true&Application=MyMetro&Expiration=true");
@@ -83,28 +68,37 @@
 		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();
 		
-		for (int i=0; i<contentElems.size(); i++) {
-			if (contentElems.get(i).text().trim().equalsIgnoreCase("køreplan")) {
+		for (int i=4; i<contentElems.size(); i++) {
+			if (contentElems.get(i).text().trim().equalsIgnoreCase("køreplan")) {				
 				bean.plan = contentElems.get(i+1).text();
 			}
 		}