--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/13 17:57:31	1042
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/16 13:32:10	1060
@@ -2,44 +2,60 @@
 
 
 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 org.simpleframework.xml.ElementList;
+import org.simpleframework.xml.Root;
 
 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;
+import dk.thoerup.traininfoservice.StationBean.StationEntry;
 
 
 
 public class MetroFetcher {
+	@Root(name="entry")
 	public static class MetroEntry {
+		
+		@org.simpleframework.xml.Element
 		String metro;
+		
+		@org.simpleframework.xml.Element
 		String destination;
+		
+		@org.simpleframework.xml.Element
 		String minutes;		
 	}
 	
+	@Root(name="metrodepatures")
 	public static class MetroBean {
+		
+		@org.simpleframework.xml.Element
 		String head;
-		String operationInfo; //driftsinfo
-		String plan; // koereplan
 		
+		
+		@org.simpleframework.xml.Element(name="operations")
+		String operationInfo; //driftsinfo	
+		
+		@ElementList
 		List<MetroEntry> entries = new ArrayList<MetroEntry>();
+		
+		@org.simpleframework.xml.Element
+		String plan; // koereplan
 	}
 	
 	Logger logger = Logger.getLogger(MetroFetcher.class.getName());
 	StationDAO stationDAO = new StationDAO();
 	
-	Map<String, MetroBean> cache = new TimeoutMap<String,MetroBean>(1000);
+	Map<String, MetroBean> cache = new TimeoutMap<String,MetroBean>(60000); //TODO: make metro cache timeout configurable
 	
 	public MetroBean cachedLookupMetroDepartures(int stationID) throws Exception {
 		final String key = "metro:" + stationID;
@@ -58,10 +74,11 @@
 
 	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");
+		logger.fine("URL:" + url);
 		
 	    JsoupInvocation wrapper = new JsoupInvocation( url, 3000);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("metro");
@@ -82,27 +99,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(); 		
-		bean.plan = contentElems.get(5).text();
+		bean.operationInfo = contentElems.get(3).text();
 		
+		for (int i=4; i<contentElems.size(); i++) {
+			if (contentElems.get(i).text().trim().equalsIgnoreCase("køreplan")) {				
+				bean.plan = contentElems.get(i+1).text();
+			}
+		}
+
 		return bean;
 	}