--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/02 19:05:08	582
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/05/03 07:42:02	697
@@ -1,14 +1,12 @@
 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;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -16,18 +14,22 @@
 
 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) {
+	public DepartureFetcher(boolean tempSite, int cacheTimeout) {
 		useTempSite = tempSite;
+		cache = new TimeoutMap<Integer,List<DepartureBean>>(cacheTimeout);
 	}
 	
 	
@@ -50,37 +52,21 @@
 	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;
 	}
 	
@@ -96,7 +82,7 @@
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
-	    final WebClient webClient = new WebClient();
+	    final WebClient webClient = new WebClient( BrowserVersion.FIREFOX_3 );
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    	    	    
@@ -146,12 +132,15 @@
 		    		String note = extractNote( fields.get(7) );
 		    		departure.setNote(note);
 		    		
+		    		departure.setType(type);
+		    		
 		    		departureList.add(departure);
 		    	}
 		    }
 	    } else {
 	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
 	    }
+	    webClient.closeAllWindows();
 	    
 	    return departureList;
 	}
@@ -160,7 +149,7 @@
 		
 		List<DepartureBean> departureList = new ArrayList<DepartureBean>();
 		
-	    final WebClient webClient = new WebClient();
+	    final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
 	    webClient.setTimeout(2500);
 	    webClient.setJavaScriptEnabled(false);
 	    
@@ -190,7 +179,7 @@
 		    	DepartureBean departure = new DepartureBean();
 
 		    	String time = fields.get(0).asText().trim();
-		    	logger.info("time:" + time);
+
 		    	if (time.equals(""))
 		    		time = "0:00"; //Bane.dk bug work-around
 		    	departure.setTime(time);
@@ -216,6 +205,8 @@
 	    } else {
 	    	logger.warning("No departures found for station=" + stationcode + ", type=" + type);
 	    }
+	    webClient.closeAllWindows();
+	    
 	    
 	    return departureList;
 	}
@@ -264,7 +255,6 @@
 		}
 		
 		
-		
 		return number;
 	}