--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/05/03 07:42:02	697
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/11/12 18:33:38	1190
@@ -1,20 +1,28 @@
 package dk.thoerup.traininfoservice.banedk;
 
 import java.io.IOException;
-import java.util.List;
+import java.io.StringWriter;
+
 import java.util.logging.Level;
 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;
 
+import org.simpleframework.xml.Serializer;
+import org.simpleframework.xml.core.Persister;
+
+import dk.thoerup.android.traininfo.common.TimetableBean;
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
+import dk.thoerup.traininfoservice.Statistics;
 
 /**
  * Servlet implementation class TimetableServlet
  */
+@WebServlet(urlPatterns={"/TimetableServlet"})
 public class TimetableServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
        
@@ -23,93 +31,69 @@
 	
 	TimetableFetcher fetcher;
 	
+	
 	@Override
 	public void init() throws ServletException {
 		super.init();
 		
-		boolean useTempSite =  Boolean.parseBoolean( getServletContext().getInitParameter("usetempsite") );
+		boolean useAzureSite =  Boolean.parseBoolean( getServletContext().getInitParameter("useazuresite") );
 		int cacheTimeout =  Integer.parseInt( getServletContext().getInitParameter("cache_timeout") );
-		logger.info( "TimetableServlet, use temp site=" + useTempSite + ", cache=" + cacheTimeout);
-		fetcher = new TimetableFetcher(useTempSite,cacheTimeout);
+		int replyTimeout =  Integer.parseInt( getServletContext().getInitParameter("reply_timeout") );
+		logger.info( "TimetableServlet, use azure site=" + useAzureSite + ", cache=" + cacheTimeout);
+		fetcher = new TimetableFetcher(useAzureSite,cacheTimeout,replyTimeout);
 	}
 	
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		if (request.getParameter("train") == null) {
-			response.sendError(400, "not enough parameters");
+			response.sendError(400, "not enough parameters (train)");
+			return;
+		}
+		if (request.getParameter("type") == null) {
+			response.sendError(400, "not enough parameters (type)");
 			return;
 		}
+		Statistics.getInstance().incrementTimetableLookups();
 		
 		String train = request.getParameter("train").trim();
-		String trainID;
-		String type = request.getParameter("type");
-		
-		if (type != null) {
-			 trainID = train;
-		} else { //remove this failover sometime after release of client 0.6.4 
-			String sections[] = train.split(" ");
-			if (sections.length != 2) {
-				response.sendError(400, "Invalid parameter");
-				return;
-			}
+		String type = request.getParameter("type").trim();
 				
-			type = lookupType(sections[0]);
-			trainID = sections[1];
-		}
-		
 		try
 		{
-			List<TimetableBean> timetable = fetcher.cachedLookupTimetable(trainID, type);
+			TimetableBean timetable = fetcher.cachedLookupTimetable(train, type);
 		
 			String responseXML = formatTimetable(timetable);
 		
 			response.setContentType("text/xml");
 			response.getWriter().print(responseXML);
 		} catch (java.io.IOException ioe) {
-			logger.warning("(timetable) Read failed, train="+train + ". " + ioe.getMessage());
+			logger.warning("(timetable) Read failed, type=" + type + ", train="+train + ". " + ioe.getMessage());
+			Statistics.getInstance().incrementTimetableErrors();
 			response.sendError(500, "Backend timed out");
 		} catch (CircuitBreakerException cbe) {
-			logger.warning("Circuitbreaker - failing fast");
+			logger.warning("Circuitbreaker - failing fast, type=" + type + ", train="+train);
+			Statistics.getInstance().incrementTimetableErrors();
 			response.sendError(500);
 		}catch (Exception e) {
-			logger.log(Level.WARNING, "failure looking up timetable: train=" +train, e);
+			logger.log(Level.WARNING, "failure looking up timetable: type=" + type + ",train=" +train, e);
+			Statistics.getInstance().incrementTimetableErrors();
 			response.sendError(500);
 		}
 		
 	}
-	/*remove /outcomment/deprecate after 0.6.4 release */
-	String lookupType(String trainCode) {
-		trainCode = trainCode.toLowerCase();
-		
-		if (trainCode.equals("a") || trainCode.equals("b") || trainCode.equals("bx") || trainCode.equals("c") || 
-				trainCode.equals("e") || trainCode.equals("f") || trainCode.equals("h")) {
-			return "S2";
-		} else {
-			return "FJRN";
-		}
-	}
 	
-	String formatTimetable(List<TimetableBean> timetable) {
-		StringBuffer sb = new StringBuffer();
-		
-		sb.append("<timetable>");
-		
-		for (TimetableBean bean : timetable) {
-			sb.append("<entry");
-			if (bean.isCurrent())
-				sb.append(" current=\"true\"");
-			sb.append(">");
-			
-			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("</entry>");
+	String formatTimetable(TimetableBean timetable) throws ServletException {
+		Serializer serializer = new Persister();
+
+		StringWriter out = new StringWriter();
+
+		try {
+			serializer.write(timetable, out);
+		} catch (Exception e) {
+			throw new ServletException(e);
 		}
 		
-		sb.append("</timetable>");
-		
-		return sb.toString();
+		return out.toString();
 	}
 
 }