--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/10/18 11:49:01	1168
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2011/04/04 10:56:44	1255
@@ -1,9 +1,7 @@
 package dk.thoerup.traininfoservice.banedk;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,21 +10,17 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
 
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 
 import dk.thoerup.android.traininfo.common.DepartureBean;
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
-import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.banedk.DepartureFetcher.FetchTrainType;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 /**
  * Servlet implementation class DepartureServlet
@@ -55,6 +49,7 @@
 		logger.info( "DepartureServlet, use azure site=" + useAzureSite + ", cache=" + cacheTimeout);
 		fetcher = new DepartureFetcher(useAzureSite, cacheTimeout, replyTimeout);
 		
+		/*
 		xslTransFact = TransformerFactory.newInstance();
 		
 		String xslPath = getServletContext().getRealPath("/departures.xsl");
@@ -64,7 +59,7 @@
 			xslTemplate = xslTransFact.newTemplates(stylesheet);
 		} catch (Exception e) {
 			throw new ServletException(e);
-		}
+		}*/
 	}
 
 	@Override
@@ -88,10 +83,15 @@
 		int station = Integer.parseInt( req.getParameter("station") );
 		String format = req.getParameter("format");
 
-		DepartureBean beans;		
+		DepartureBean beans;
+		
+		DepartureFetcher.FetchTrainType type = FetchTrainType.BOTH;
+		if ( req.getParameter("type") != null) {
+			type = FetchTrainType.valueOf( req.getParameter("type") );
+		}
 
 		try {
-			beans = fetcher.cachedLookupDepartures(station, arrival);
+			beans = fetcher.cachedLookupDepartures(station, arrival, type);
 			beans.arrival = arrival;
 		} catch (java.io.IOException ioe) {
 			logger.warning("Read failed, station="+station + ". " + ioe.getMessage() );
@@ -122,16 +122,16 @@
 			resp.setContentType("text/xml");
 			resp.getWriter().print( formatXml(beans) );
 		} else if (format.equalsIgnoreCase("html")) {
-			/*
+			
 			String advStr = req.getParameter("advanced");
 			boolean advanced = advStr != null ? Boolean.parseBoolean(advStr) : false;
 			
 			req.setAttribute("advanced", advanced);
 			req.setAttribute("departurebeans", beans);
 			req.setAttribute("stationID", station );
-			getServletContext().getRequestDispatcher("/ViewDepartures.jsp").forward(req,resp);*/
-			resp.setContentType("text/html");
-			resp.getWriter().print(  xmlToHtml(formatXml(beans))  );
+			getServletContext().getRequestDispatcher("/ViewDepartures.jsp").forward(req,resp);
+			/*resp.setContentType("text/html");
+			resp.getWriter().print(  xmlToHtml(formatXml(beans))  );*/
 		} else {
 			resp.sendError(400, "Unknown format");			
 		}
@@ -142,7 +142,7 @@
 		
 		Serializer serializer = new Persister();
 
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		StringWriter out = new StringWriter();
 
 		try {
 			serializer.write(beans, out);
@@ -152,20 +152,21 @@
 		
 		return out.toString();
 	}
-	
+	/*
 	protected String xmlToHtml(String input) throws ServletException {
 
 		try {					
-			Transformer trans = xslTemplate.newTransformer();			
+			Transformer trans = xslTemplate.newTransformer();
+			
 		
-			Source xml = new StreamSource( new ByteArrayInputStream(input.getBytes() ));
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
+			Source xml = new StreamSource( new StringReader(input));
+			StringWriter out = new StringWriter();
 			trans.transform(xml, new StreamResult(out));		
 		
 			return out.toString();
 		} catch (Exception e) {
 			throw new ServletException(e);
 		}
-	}
+	}*/
 
 }