--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/05/05 20:11:03	711
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/06/16 09:58:15	861
@@ -54,6 +54,12 @@
 			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") );
@@ -64,17 +70,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;
 		}
@@ -162,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);