--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/05/10 06:59:01	717
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/09/02 18:37:49	1026
@@ -6,6 +6,7 @@
 import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -16,6 +17,7 @@
 /**
  * Servlet implementation class TimetableServlet
  */
+@WebServlet(urlPatterns={"/TimetableServlet"})
 public class TimetableServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
        
@@ -24,14 +26,16 @@
 	
 	TimetableFetcher fetcher;
 	
+	
 	@Override
 	public void init() throws ServletException {
 		super.init();
 		
 		boolean useTempSite =  Boolean.parseBoolean( getServletContext().getInitParameter("usetempsite") );
 		int cacheTimeout =  Integer.parseInt( getServletContext().getInitParameter("cache_timeout") );
+		int replyTimeout =  Integer.parseInt( getServletContext().getInitParameter("reply_timeout") );
 		logger.info( "TimetableServlet, use temp site=" + useTempSite + ", cache=" + cacheTimeout);
-		fetcher = new TimetableFetcher(useTempSite,cacheTimeout);
+		fetcher = new TimetableFetcher(useTempSite,cacheTimeout,replyTimeout);
 	}
 	
 	@Override
@@ -75,6 +79,7 @@
 	
 	String formatTimetable(List<TimetableBean> timetable) {
 		StringBuffer sb = new StringBuffer();
+		//sb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n");
 		
 		sb.append("<timetable>");
 		
@@ -87,7 +92,8 @@
 			sb.append("<station>").append( bean.getStation() ).append("</station>");
 			sb.append("<arrival>").append( bean.getArrival() ).append("</arrival>");
 			sb.append("<departure>").append( bean.getDeparture() ).append("</departure>");
-			
+			sb.append("<stationid>").append( bean.getStationId() ).append("</stationid>");
+			//sb.append("<cancelled>").append( bean.isCancelled() ).append("</cancelled>");
 			sb.append("</entry>");
 		}