--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2010/09/16 13:32:10	1060
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/MetroFetcher.java	2011/04/20 19:01:33	1355
@@ -2,55 +2,25 @@
 
 
 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.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.StationDAO;
+import dk.thoerup.genericjavautils.TimeoutMap;
 import dk.thoerup.traininfoservice.Statistics;
-import dk.thoerup.traininfoservice.StationBean.StationEntry;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 
 
 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;
-		
-		
-		@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();
@@ -92,47 +62,57 @@
 		Element content = doc.getElementsByClass("metro-widget-content").get(0);
 		Elements contentElems = content.children();
 							
-		Element departureTable = content.getElementsByTag("table").get(0);
-
-		Elements rows = departureTable.getElementsByTag("tr");
-
-		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 destination = fields.get(1).text();
+		Elements contentTables = content.getElementsByTag("table");
+		if ( contentTables.size() > 0 ) {
 			
-			Elements minuteFields = fields.get(2).children();			
-			String minutes ="";			
-			for (Element elm : minuteFields) {
-				minutes = minutes + elm.text() + " ";
+			Element departureTable = content.getElementsByTag("table").get(0);
+	
+			Elements rows = departureTable.getElementsByTag("tr");
+	
+			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 destination = fields.get(1).text();
+				
+				Elements minuteFields = fields.get(2).children();			
+				String minutes ="";			
+				for (Element elm : minuteFields) {
+					minutes = minutes + elm.text() + " ";
+				}
+				
+				MetroEntry entry = new MetroEntry();
+				entry.metro = metro.trim();
+				entry.destination = destination.trim();
+				entry.minutes = minutes.trim();
+				
+				bean.entries.add(entry);			
 			}
-			
-			MetroEntry entry = new MetroEntry();
-			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=4; i<contentElems.size(); i++) {
-			if (contentElems.get(i).text().trim().equalsIgnoreCase("køreplan")) {				
+
+		for (int i=0; i<contentElems.size(); i++) {
+			String currentText = contentElems.get(i).text().trim();
+			if (currentText.equalsIgnoreCase("driftsinformation")) {				
+				bean.operationInfo = contentElems.get(i+1).text();
+			}
+			
+			if (currentText.equalsIgnoreCase("køreplan")) {				
 				bean.plan = contentElems.get(i+1).text();
 			}
 		}
+		
+
 
 		return bean;
 	}