--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/04/19 19:04:34	650
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/07/09 21:02:13	969
@@ -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;
@@ -23,10 +24,12 @@
 
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
 import dk.thoerup.traininfoservice.StationDAO;
+import dk.thoerup.traininfoservice.Statistics;
 
 /**
  * Servlet implementation class DepartureServlet
  */
+@WebServlet(urlPatterns={"/DepartureServlet"})
 public class DepartureServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 	
@@ -48,12 +51,19 @@
 	}
 
 	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {		
 		if (req.getParameter("station") == null) {
 			resp.sendError(400, "not enough parameters");
 			return;
 		}
 		
+		boolean arrival = false;
+		try {
+			arrival = Integer.parseInt( req.getParameter("arrival")) != 0;
+		} catch (Exception e) {}
+		
+		Statistics.getInstance().incrementDepartureLookups();
+		
 		int station = Integer.parseInt( req.getParameter("station") );
 		String format = req.getParameter("format");
 
@@ -62,17 +72,20 @@
 		String stationName = StationDAO.getStationName(station);
 
 		try {
-			beans = fetcher.cachedLookupDepartures(station);
+			beans = fetcher.cachedLookupDepartures(station, arrival);
 		} catch (java.io.IOException ioe) {
 			logger.warning("Read failed, station="+station + ". " + ioe.getMessage() );
+			Statistics.getInstance().incrementDepartureErrors();
 			resp.sendError(500);
 			return;
 		} catch (CircuitBreakerException cbe) {
 			logger.warning("Circuitbreaker - failing fast");
+			Statistics.getInstance().incrementDepartureErrors();
 			resp.sendError(500);
 			return;
 		} catch (Exception e) {			
 			logger.log(Level.WARNING, "Unknown exception, station=" +station, e);
+			Statistics.getInstance().incrementDepartureErrors();
 			resp.sendError(500);
 			return;
 		}
@@ -82,7 +95,7 @@
 		
 		if (format.equalsIgnoreCase("xml")) {
 			resp.setContentType("text/xml");
-			resp.getWriter().print( formatXml(beans, stationName) );
+			resp.getWriter().print( formatXml(beans, stationName, arrival) );
 		} else if (format.equalsIgnoreCase("html")) {
 			
 			String advStr = req.getParameter("advanced");
@@ -94,12 +107,12 @@
 			req.setAttribute("stationID", station );
 			getServletContext().getRequestDispatcher("/ViewDepartures.jsp").forward(req,resp);
 		} else {
-			throw new ServletException("Unknown format");
+			resp.sendError(400, "Unknown format");			
 		}
 
 	}
 
-	protected String formatXml(List<DepartureBean> beans, String stationName) throws ServletException{
+	protected String formatXml(List<DepartureBean> beans, String stationName, boolean arrival) throws ServletException{
 		String xml = "";
 		try {
 			DocumentBuilder builder = docBuilderFactory.newDocumentBuilder();
@@ -109,6 +122,7 @@
 			Document doc = impl.createDocument(null,null,null);
 	        Element root = doc.createElement("departureinfo");
 	        root.setAttribute("station", stationName);
+	        root.setAttribute("arrival", Boolean.toString(arrival) );
 	        for (DepartureBean departure : beans) {
 	        	Element train = doc.createElement("train");
 	        	
@@ -144,6 +158,10 @@
 	        	note.setTextContent( departure.getNote() );
 	        	train.appendChild(note);
 	        	
+	        	Element type = doc.createElement("type");
+	        	type.setTextContent( departure.getType() );
+	        	train.appendChild(type);
+	        	
 	        	root.appendChild(train);
 	        }
 	        
@@ -156,7 +174,7 @@
 	        //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
 	        transformer.setOutputProperty(OutputKeys.METHOD, "xml");
 	        transformer.setOutputProperty(OutputKeys.ENCODING,"ISO-8859-1");
-	        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+	        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "1");
 	        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
 	        java.io.StringWriter sw = new java.io.StringWriter();
 	        StreamResult sr = new StreamResult(sw);