--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2009/10/22 06:04:45	468
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/08 19:12:15	588
@@ -1,8 +1,5 @@
 package dk.thoerup.traininfoservice.banedk;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -16,13 +13,24 @@
 
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.DBConnection;
+import dk.thoerup.traininfoservice.StationBean;
+import dk.thoerup.traininfoservice.StationDAO;
 
 public class DepartureFetcher {
 	
 	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
 	
-	Map<Integer, List<DepartureBean>> cache = new TimeoutMap<Integer,List<DepartureBean>>(120 * 1000);
+	Map<Integer, List<DepartureBean>> cache;
+	
+	StationDAO stationDao = new StationDAO();
+	
+	private boolean useTempSite;
+	
+	public DepartureFetcher(boolean tempSite, int cacheTimeout) {
+		useTempSite = tempSite;
+		cache = new TimeoutMap<Integer,List<DepartureBean>>(cacheTimeout);
+	}
+	
 	
 		
 	
@@ -43,41 +51,33 @@
 	public List<DepartureBean> lookupDepartures(int stationID) throws Exception {
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
-		Connection conn = null;
-		try 
-		{
-			conn = DBConnection.getConnection();
-		
-			String SQL = "SELECT stationcode_fjrn, stationcode_stog FROM trainstations WHERE id=" + stationID;
-			Statement stmt = conn.createStatement();
-			ResultSet rs = stmt.executeQuery(SQL);
-			
-			if (rs.next()) {
-				String code = rs.getString( 1 );
-				if (! rs.wasNull() ) {
-					List<DepartureBean> list = lookupDepartures(code, "FJRN");
-					departureList.addAll(list);
-				}
-				
-				code = rs.getString(2);
-				if (! rs.wasNull() ) {
-					List<DepartureBean> list = lookupDepartures(code, "S2");
-					departureList.addAll(list);	
-				}
-				Collections.sort( departureList );
-			
-			}
-			
-		} finally {
-			if (conn != null && !conn.isClosed() ) {
-				conn.close();
-			}
+		StationBean station = stationDao.getById(stationID);
+		
+		if (station.getRegional() != null) {
+			List<DepartureBean> list = lookupDepartures(station.getRegional(), "FJRN");
+			departureList.addAll(list);			
 		}
 		
+		if (station.getStrain() != null) {
+			List<DepartureBean> list = lookupDepartures(station.getStrain(), "S2");
+			departureList.addAll(list);	
+		}		
+		
+		Collections.sort( departureList );
+
+		
 		return departureList;
 	}
 	
 	public List<DepartureBean> lookupDepartures(String stationcode, String type) throws Exception {
+		if (useTempSite == false) {
+			return lookupDeparturesNormalSite(stationcode, type);
+		} else {
+			return lookupDeparturesFromTemporarySite(stationcode, type);
+		}
+	}
+	
+	public List<DepartureBean> lookupDeparturesNormalSite(String stationcode, String type) throws Exception {
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
@@ -141,6 +141,71 @@
 	    return departureList;
 	}
 	
+	public List<DepartureBean> lookupDeparturesFromTemporarySite(String stationcode, String type) throws Exception {
+		
+		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
+		
+	    final WebClient webClient = new WebClient();
+	    webClient.setTimeout(2500);
+	    webClient.setJavaScriptEnabled(false);
+	    
+
+	    String uri = "http://bane.dk/lite/station.asp?w=" + type + "&s=" + stationcode;
+	    
+	    BanedkInvocation wrapper = new BanedkInvocation(webClient, uri);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
+	    
+	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
+	    
+	    HtmlElement table = page.getElementById("traf_afgang");
+	    
+	    if (table != null) {		    	
+		    DomNodeList<HtmlElement> tableRows =  table.getElementsByTagName("tr");
+		    
+		    boolean isFirst = true;
+		    
+		    for (HtmlElement currentRow : tableRows) {
+		    	if (isFirst == true) { //skip table headers
+		    		isFirst = false;
+		    		continue;
+		    	}
+		    	
+		    	DomNodeList<HtmlElement> fields = currentRow.getElementsByTagName("td");
+
+		    	DepartureBean departure = new DepartureBean();
+
+		    	String time = fields.get(0).asText().trim();
+
+		    	if (time.equals(""))
+		    		time = "0:00"; //Bane.dk bug work-around
+		    	departure.setTime(time);
+
+
+		    	String trainNumber = fields.get(1).asText();
+		    	departure.setTrainNumber(trainNumber);
+
+		    	String destination = fields.get(2).asText();
+		    	departure.setDestination(destination);
+
+		    	String origin = fields.get(3).asText();
+		    	departure.setOrigin(origin);
+
+		    	String status = fields.get(4).asText();
+		    	departure.setStatus(status);
+
+		    	String note = fields.get(5).asText();
+		    	departure.setNote(note);
+
+		    	departureList.add(departure);
+		    }
+	    } else {
+	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
+	    }
+	    
+	    return departureList;
+	}
+
+	
 	private int extractUpdated(HtmlElement updatedTd) { //extract the digit (in this case: 4) from "media/trafikinfo/opdater4.gif" 
 		int updated = -1;
 		
@@ -189,6 +254,7 @@
 	}
 	
 	//test
+	/*
 	public static void main(String args[]) throws Exception {
 		DepartureFetcher f = new DepartureFetcher();
 		List<DepartureBean> deps = f.lookupDepartures("AR", "FJRN");
@@ -198,5 +264,5 @@
 		}
 		
 		System.out.println("--------------------------");
-	}
+	}*/
 }