--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/06/11 20:50:40	842
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2011/05/02 12:19:12	1411
@@ -1,57 +1,52 @@
 package dk.thoerup.traininfoservice.banedk;
 
 
-import java.io.IOException;
+
 import java.net.URL;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.gargoylesoftware.htmlunit.BrowserVersion;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.RefreshHandler;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomNodeList;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 
+import dk.thoerup.android.traininfo.common.StationBean;
+import dk.thoerup.android.traininfo.common.StationEntry;
+import dk.thoerup.android.traininfo.common.TimetableBean;
+import dk.thoerup.android.traininfo.common.TimetableEntry;
 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.TraininfoSettings;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 public class TimetableFetcher {
-	
-	class NullRefreshHandler implements RefreshHandler {
-		public void handleRefresh(Page arg0, URL arg1, int arg2) throws IOException {			
-		}
-		
-	}
+
 		
-	Map<String, List<TimetableBean>> cache; 
-	Map<String, Integer> stationCache;
+	Map<String, TimetableBean> cache; 
+	Map<String, StationEntry> stationCache;
 
 	StationDAO stationDao = new StationDAO();
 	
 	
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
+
+	TraininfoSettings settings;	
 	
-	private boolean useTempSite;
-	
-	public TimetableFetcher(boolean tmpSite, int cacheTimeout) {
-		useTempSite = tmpSite;
+	public TimetableFetcher(TraininfoSettings settings) {
+		this.settings = settings;
 		
-		cache = new TimeoutMap<String,List<TimetableBean>>(cacheTimeout);
-		stationCache = new TimeoutMap<String,Integer>( 3*60*60*1000 );
+		cache = new TimeoutMap<String,TimetableBean>( settings.getCacheTimeout() );
+		stationCache = new TimeoutMap<String,StationEntry>( 3*60*60*1000 );
 	}
 	
 	
-	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Exception {
+	TimetableBean cachedLookupTimetable(String trainID, String type) throws Exception {
 		String key = trainID+type;
-		List<TimetableBean> list = cache.get(key);
+		TimetableBean list = cache.get(key);
 		
 		if (list == null) {
 			list = lookupTimetable(trainID,type);
@@ -63,97 +58,245 @@
 		return list;
 	}
 	
-	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {
-		if (useTempSite == false ){
-			return lookupTimetableRealSite(trainID, type);
+	TimetableBean lookupTimetable(String trainID, String type) throws Exception {
+		if (settings.getBackend() == TraininfoSettings.Backend.Azure ){
+			return lookupTimetableAzureSite(trainID, type);
+			
 		} else {
-			return new ArrayList<TimetableBean>(); // no timetable data on temp site
+			return lookupTimetableMobileSite(trainID, type);
 		}
 	}
 	
-	int getStationId(String name) {
-		Integer id = stationCache.get(name);
+	StationEntry getStationId(String name) {
+		StationEntry station = stationCache.get(name);
 		
-		if (id == null) {
+		if (station == null) {
 			try {
-				id = stationDao.getIdByName(name);
-				stationCache.put(name, id);
+				StationBean bean = stationDao.getByName(name);
+				if (bean.entries.size() == 1) {
+					station = bean.entries.get(0);
+					stationCache.put(name,station);
+				}
 			} catch (SQLException e) {
 				logger.log(Level.SEVERE, "getStationId failed", e);
-				id = -1;
 			}
 		} 
 
-		return id;
+		return station;
+	}
+	
+	String correctStationName(String name) {
+		if (name.equals("København"))
+			name = "København H"; //correct inconsistency in naming
+		
+		return name;		
 	}
 
-	List<TimetableBean> lookupTimetableRealSite(String trainID, String type) throws Exception {		
-		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
+	TimetableBean lookupTimetableAzureSite(String trainID, String type) throws Exception {		
+		TimetableBean timetableBean = new TimetableBean();
 		
-		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
-				
 
-	    final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
-	    webClient.setTimeout(2500);
-	    webClient.setJavaScriptEnabled(false);	   
-	    webClient.setRefreshHandler( new NullRefreshHandler() );
-	    webClient.setCssEnabled(false);
+		String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID;			
+		logger.fine("URL:" + url);
 	    
-	    
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, url);
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , settings.getReplyTimeout() );
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
-	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
+	    Document doc = (Document) breaker.invoke(wrapper);
 	    	    
 	    
 	    boolean currentStation = false;
 	    boolean currentStationSaved = false;
 	    
-	    List<HtmlElement> tables = page.getDocumentElement().getElementsByAttribute("table", "class", "Rute");
+	    Elements tables = doc.getElementsByClass("Rute");
+	    
 	    if (tables.size() == 1) {
-	    	HtmlElement timetable = tables.get(0);
-	    	DomNodeList<HtmlElement> rows = timetable.getElementsByTagName("tr");
+	    	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;
 	    		
 	    		
-	    		HtmlElement row = rows.get(i);
-	    		DomNodeList<HtmlElement> fields = row.getElementsByTagName("td");
+	    		Element row = rows.get(i);
+	    		Elements fields = row.getElementsByTag("td");
+
 	    		
-	    		if (currentStationSaved == false && fields.get(0).getAttribute("class").equalsIgnoreCase("Tidsstreg")) {
+	    		if (currentStationSaved == false && fields.get(0).attr("class").equalsIgnoreCase("Tidsstreg")) {
 	    			currentStation = true;
 	    			continue;
 	    		}
 	    		
-	    		TimetableBean bean = new TimetableBean();
+	    		TimetableEntry entry = new TimetableEntry();
 	    		
-	    		String station = fields.get(0).asText() ;
-	    		if (station.equals("København"))
-	    			station = "København H"; //correct inconsistency in naming
-	    		
-	    		bean.setStation( station );
-	    		bean.setArrival( fields.get(1).asText() );
-	    		bean.setDeparture( fields.get(2).asText() );
+	    		String station = correctStationName( fields.get(0).text() );
+	    		
+	    		entry.setStation( station );
+	    		entry.setArrival( fields.get(1).text() );
+	    		entry.setDeparture( fields.get(2).text() );
+	    		
+	    		boolean cancelled = fields.get(3).text().equalsIgnoreCase("aflyst");
+	    		entry.setCancelled(cancelled);
 	    		
 	    		if (currentStation == true && currentStationSaved == false ) {
-	    			bean.setCurrent(currentStation);
+	    			entry.setCurrent(currentStation);
 	    			currentStationSaved = true;
 	    		}
 	    		
-	    		bean.setStationId( getStationId( station ));
+	    		entry.setStationId( getStationId( station ));
 	    		
-	    		timetableList.add(bean);
-
+	    		timetableBean.entries.add(entry);
+	    	}
+	    	
+	    	//TODO: There is an off-by-one error in this cancelled parser thingie
+	    	final String cancelledString = "Aflyst";
+	    	for (int i=0;i<timetableBean.entries.size(); i++) { //handle cancelled labels
+	    		final int lastIdx = (timetableBean.entries.size() - 1);
+	    		
+	    		TimetableEntry current = timetableBean.entries.get(i);
+	    		if (current.isCancelled()) {
+		    		if (i == 0) {
+		    			current.setDeparture(cancelledString);
+		    		} else if (i == lastIdx) {
+		    			current.setArrival(cancelledString);
+		    		} else if (i>0 && i<lastIdx) {
+		    			TimetableEntry next = timetableBean.entries.get(i+1);
+		    			TimetableEntry prev = timetableBean.entries.get(i-1);
+		    			
+		    			if (next.isCancelled())
+		    				current.setDeparture(cancelledString);
+		    			if (prev.isCancelled())
+		    				current.setArrival(cancelledString);
+		    		}
+	    		}
 	    	}
 	    	
 	    } else {
 	    	logger.warning("No time table found, trainID=" + trainID + " type=" + type);
 	    }
-	    webClient.closeAllWindows();
+	    
 		
-		return timetableList;
+		return timetableBean;
+	}
+
+	TimetableBean lookupTimetableMobileSite(String trainID, String type) throws Exception {
+		TimetableBean timetableBean = new TimetableBean();
+		
+		String url = "http://mobil.bane.dk/mobilStation.asp?artikelID=5332&tognummer=" + trainID + "&webprofil=" + type + "&mode=rute";
+		logger.fine("URL:" + url);
+
+	    
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , settings.getReplyTimeout() );
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
+	    
+	    Document doc = (Document) breaker.invoke(wrapper);
+
+	    Element content = doc.getElementsByClass("contentDiv").get(1);
+	    Element dlist = content.child(0);
+
+	    
+	    Elements rows = dlist.getElementsByTag("dt");
+
+	    for (int i=0; i<rows.size(); i++) {
+
+	    	Element row = rows.get(i);
+	    	
+	    	logger.fine( row.text() );
+	    	
+	    	String parts[] = row.text().split(",");
+	    	
+	    	TimetableEntry entry = new TimetableEntry();
+
+	    	String station = DepartureFetcher.cleanText( parts[0] ) ;
+	    	station = correctStationName(station);
+
+
+	    	String arrival = DepartureFetcher.cleanText( parts[1] );
+	    	String departure = DepartureFetcher.cleanText( "" );
+
+	    	entry.setStation( station );
+	    	entry.setArrival( arrival );
+	    	entry.setDeparture( departure );
+
+
+	    	entry.setStationId( getStationId( station ));
+
+	    	timetableBean.entries.add(entry);
+	    }	    	
+
+
+	    return timetableBean;
+
 	}
 	
+	@Deprecated
+	TimetableBean lookupTimetableWwwSite(String trainID, String type) throws Exception {		
+		TimetableBean timetableBean = new TimetableBean();
+		
+		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
+		logger.fine("URL:" + url);
+
+	    
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , settings.getReplyTimeout() );
+	    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;
+	    		}
+	    		
+	    		TimetableEntry entry = new TimetableEntry();
+	    		
+	    		String station = DepartureFetcher.cleanText( fields.get(0).text() ) ;
+	    		station = correctStationName(station);
+
+	    		
+	    		String arrival = DepartureFetcher.cleanText( fields.get(1).text() );
+	    		String departure = DepartureFetcher.cleanText( fields.get(2).text() );
+	    		
+	    		entry.setStation( station );
+	    		entry.setArrival( arrival );
+	    		entry.setDeparture( departure );
+    		
+	    		
+	    		if (currentStation == true && currentStationSaved == false ) {
+	    			entry.setCurrent(currentStation);
+	    			currentStationSaved = true;
+	    		}
+	    		
+	    		entry.setStationId( getStationId( station ));
+	    		
+	    		timetableBean.entries.add(entry);
+	    	}	    	
+	    	
+	    } else {
+	    	logger.warning("No time table found, trainID=" + trainID + " type=" + type);
+	    }
+	    
+		
+		return timetableBean;
+	}	
+	
 }