--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/02/05 19:15:12	585
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/06/16 10:03:13	862
@@ -1,9 +1,6 @@
 package dk.thoerup.traininfoservice.banedk;
 
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -25,7 +22,8 @@
 import org.w3c.dom.Element;
 
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
-import dk.thoerup.traininfoservice.DBConnection;
+import dk.thoerup.traininfoservice.StationDAO;
+import dk.thoerup.traininfoservice.Statistics;
 
 /**
  * Servlet implementation class DepartureServlet
@@ -51,31 +49,41 @@
 	}
 
 	@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");
 
 		List<DepartureBean> beans;
 
-		String stationName = getStationName(station);
+		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;
 		}
@@ -97,7 +105,7 @@
 			req.setAttribute("stationID", station );
 			getServletContext().getRequestDispatcher("/ViewDepartures.jsp").forward(req,resp);
 		} else {
-			throw new ServletException("Unknown format");
+			resp.sendError(400, "Unknown format");			
 		}
 
 	}
@@ -147,6 +155,10 @@
 	        	note.setTextContent( departure.getNote() );
 	        	train.appendChild(note);
 	        	
+	        	Element type = doc.createElement("type");
+	        	type.setTextContent( departure.getType() );
+	        	train.appendChild(type);
+	        	
 	        	root.appendChild(train);
 	        }
 	        
@@ -159,7 +171,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);
@@ -173,27 +185,4 @@
 		return xml;
 	}
 
-	protected String getStationName(int stationID) {
-		String station = "";
-
-		Connection conn = null;
-		try {
-			conn = DBConnection.getConnection();
-			Statement stmt = conn.createStatement();
-			ResultSet rs = stmt.executeQuery("SELECT name FROM trainstations WHERE id=" + stationID);
-			if (rs.next()) {
-				station = rs.getString(1);
-			}
-
-		} catch (Exception e) {	
-		} finally {
-			try {
-				if (conn != null && !conn.isClosed())
-					conn.close();
-			} catch (Exception e) {}
-		}
-
-		return station;
-	}
-
 }