--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/14 05:51:58	1047
+++ android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/21 20:10:46	1093
@@ -4,16 +4,26 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.sf.jsr107cache.Cache;
+import net.sf.jsr107cache.CacheException;
+import net.sf.jsr107cache.CacheManager;
+
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import com.google.appengine.api.memcache.jsr107cache.GCacheFactory;
+
+import dk.thoerup.android.traininfo.common.DepartureBean;
+import dk.thoerup.android.traininfo.common.DepartureEntry;
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationBean;
 import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
 
@@ -23,38 +33,48 @@
 		STOG,
 		REGIONAL
 	}
+	Cache cache;
 	
-	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());
-	
-	Map<String, DepartureBean> cache;
+	Logger logger = Logger.getLogger(DepartureFetcher.class.getName());	
 	
 	StationDAO stationDao = new StationDAO();
 	
 	private boolean useAzureSite;
 	private int replyTimeout;
 	
+	@SuppressWarnings("unchecked")
 	public DepartureFetcher(boolean azureSite, int cacheTimeout, int replyTimeout) {
 		this.replyTimeout = replyTimeout;
 		useAzureSite = azureSite;
-		cache = new TimeoutMap<String,DepartureBean>(cacheTimeout);
+
+        Map props = new HashMap();
+        props.put(GCacheFactory.EXPIRATION_DELTA_MILLIS, cacheTimeout);        
+		
+		try {
+            cache = CacheManager.getInstance().getCacheFactory().createCache(props);            
+        } catch (CacheException e) {
+        	logger.log(Level.WARNING, "error creating cache", e);
+        }
+
 	}
 	
 	
 		
 	
 	public DepartureBean cachedLookupDepartures(int stationID, boolean arrival) throws Exception {
-		final String key = "" + stationID + ":" + arrival;
+		final String key = "departure:" + stationID + ":" + arrival;
 		
-		DepartureBean departureBean = cache.get(key);
-
+		DepartureBean departureBean = (DepartureBean) cache.get(key);
 		
 		if (departureBean == null) {
 			departureBean = lookupDepartures(stationID,arrival);
 			cache.put(key, departureBean);
+			logger.info("Departure: Cache miss " + key + " !!! "); //remove before production
 		} else {
 			Statistics.getInstance().incrementDepartureCacheHits();
-			logger.info("Departure: Cache hit " + key); //remove before production
+			logger.info("Departure: Cache hit " + key); 
 		}
+		
 		return departureBean;
 	}
 		
@@ -63,27 +83,32 @@
 		
 		DepartureBean departureBean = new DepartureBean();
 		
-		StationBean station = stationDao.getById(stationID);
+		//TODO: debug code
+		StationEntry station = new StationEntry(); // stationDao.getById(stationID);
+		station.setId(82);
+		station.setName("Test Station");
+		station.setRegional("HS");
+		//TODO: end of debug code
 		
 		departureBean.stationName = station.getName();
 		
 		if (station.getRegional() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
-			departureBean.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}
 		
 		if (station.getStrain() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival);
-			departureBean.departureEntries.addAll( tempBean.departureEntries );
+			departureBean.entries.addAll( tempBean.entries );
 			departureBean.notifications.addAll(tempBean.notifications);
 		}		
 		
-		if (departureBean.departureEntries.size() == 0) {
+		if (departureBean.entries.size() == 0) {
 			logger.info("No departures found for station " + stationID);
 		}
 		
-		Collections.sort( departureBean.departureEntries );
+		Collections.sort( departureBean.entries );
 
 		
 		return departureBean;
@@ -131,7 +156,7 @@
 
 	    String uri = "http://trafikinfo.bane.dk/Trafikinformation/AfgangAnkomst/" + arrivalDeparture + "/" + stationcode + "/" + typeString + "/UdvidetVisning";	    
 	    
-	    //logger.info("URI: " + uri);	    
+	    logger.fine("URI: " + uri);	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
@@ -193,7 +218,7 @@
 		    		
 		    		departure.setType(typeString);
 		    		
-		    		departureBean.departureEntries.add( departure );
+		    		departureBean.entries.add( departure );
 		    	}
 		    }
 	    } else {
@@ -235,6 +260,8 @@
 		
 			 	    	    
 	    String uri = "http://www.bane.dk/visStation.asp?ArtikelID=4275&W=" + type + "&S=" + stationcode;
+	    logger.fine("URI:" + uri);
+	    
 
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout); 
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
@@ -301,7 +328,7 @@
 		    		
 		    		departure.setType(type);
 		    		
-		    		departureBean.departureEntries.add(departure);
+		    		departureBean.entries.add(departure);
 		    		
 		    		
 		    	}