--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/09/08 12:38:26	1035
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/09/08 12:49:22	1036
@@ -30,11 +30,11 @@
 	
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
 	
-	private boolean useTempSite;
+	private boolean useAzureSite;
 	private int replyTimeout;
 	
-	public TimetableFetcher(boolean tmpSite, int cacheTimeout, int replyTimeout) {
-		useTempSite = tmpSite;
+	public TimetableFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) {
+		useAzureSite = azureSite;
 		this.replyTimeout = replyTimeout;
 		
 		cache = new TimeoutMap<String,List<TimetableBean>>(cacheTimeout);
@@ -57,10 +57,11 @@
 	}
 	
 	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {
-		if (useTempSite == false ){
-			return lookupTimetableRealSite(trainID, type);
+		if (useAzureSite == true ){
+			return lookupTimetableAzureSite(trainID, type);
+			
 		} else {
-			return new ArrayList<TimetableBean>(); // no timetable data on temp site
+			return lookupTimetableWwwSite(trainID, type);
 		}
 	}
 	
@@ -80,7 +81,7 @@
 		return id;
 	}
 
-	List<TimetableBean> lookupTimetableRealSite(String trainID, String type) throws Exception {		
+	List<TimetableBean> lookupTimetableAzureSite(String trainID, String type) throws Exception {		
 		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
 		
 		//String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
@@ -169,5 +170,70 @@
 		
 		return timetableList;
 	}
+
+	List<TimetableBean> lookupTimetableWwwSite(String trainID, String type) throws Exception {		
+		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
+		
+		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
+
+
+	    
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
+	    
+	    Document doc = (Document) breaker.invoke(wrapper);
+	    	    
+	    
+	    boolean currentStation = false;
+	    boolean currentStationSaved = false;
+	    
+	    Elements tables = doc.getElementsByClass("Rute");
+	    
+	    if (tables.size() == 1) {
+	    	Element timetable = tables.get(0);
+	    	Elements rows = timetable.getElementsByTag("tr");
+	    	
+	    	for (int i=0; i<rows.size(); i++) {
+	    		if (i==0) //First row is column headers
+	    			continue;
+	    		
+	    		
+	    		Element row = rows.get(i);
+	    		Elements fields = row.getElementsByTag("td");
+
+	    		
+	    		if (currentStationSaved == false && fields.get(0).attr("class").equalsIgnoreCase("Tidsstreg")) {
+	    			currentStation = true;
+	    			continue;
+	    		}
+	    		
+	    		TimetableBean bean = new TimetableBean();
+	    		
+	    		String station = fields.get(0).text() ;
+	    		if (station.equals("København"))
+	    			station = "København H"; //correct inconsistency in naming
+	    		
+	    		bean.setStation( station );
+	    		bean.setArrival( fields.get(1).text() );
+	    		bean.setDeparture( fields.get(2).text() );
+    		
+	    		
+	    		if (currentStation == true && currentStationSaved == false ) {
+	    			bean.setCurrent(currentStation);
+	    			currentStationSaved = true;
+	    		}
+	    		
+	    		bean.setStationId( getStationId( station ));
+	    		
+	    		timetableList.add(bean);
+	    	}	    	
+	    	
+	    } else {
+	    	logger.warning("No time table found, trainID=" + trainID + " type=" + type);
+	    }
+	    
+		
+		return timetableList;
+	}	
 	
 }