--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/02/02 18:42:38	580
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/02/05 19:15:12	585
@@ -43,10 +43,11 @@
 	@Override
 	public void init() throws ServletException {
 		super.init();
-		
-		boolean useTempSite =  Boolean.parseBoolean( getInitParameter("usetempsite") );
-		logger.info( "DepartureServlet, use temp site=" + useTempSite );
-		fetcher = new DepartureFetcher(useTempSite);
+
+		boolean useTempSite =  Boolean.parseBoolean( getServletContext().getInitParameter("usetempsite") );
+		int cacheTimeout =  Integer.parseInt( getServletContext().getInitParameter("cache_timeout") );
+		logger.info( "DepartureServlet, use temp site=" + useTempSite + ", cache=" + cacheTimeout);
+		fetcher = new DepartureFetcher(useTempSite, cacheTimeout);
 	}
 
 	@Override
@@ -86,6 +87,11 @@
 			resp.setContentType("text/xml");
 			resp.getWriter().print( formatXml(beans, stationName) );
 		} else if (format.equalsIgnoreCase("html")) {
+			
+			String advStr = req.getParameter("advanced");
+			boolean advanced = advStr != null ? Boolean.parseBoolean(advStr) : false;
+			
+			req.setAttribute("advanced", advanced);
 			req.setAttribute("stationname", stationName );
 			req.setAttribute("departurebeans", beans);
 			req.setAttribute("stationID", station );