--- android/TrainInfoService/src/dk/thoerup/traininfoservice/LocateStations.java	2009/09/07 12:23:35	301
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/LocateStations.java	2010/02/08 19:12:15	588
@@ -1,106 +1,113 @@
 package dk.thoerup.traininfoservice;
 
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.thoerup.traininfoservice.DBConnection;
-
 /**
  * Servlet implementation class LocateStations
  */
 public class LocateStations extends HttpServlet {
 	private static final long serialVersionUID = 1L;
-       
-    /**
-     * @see HttpServlet#HttpServlet()
-     */
-    public LocateStations() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
-
-	protected String getStations(Connection conn, double latitude, double longitude) throws SQLException {
-		//inner select is workaround from not being able to use a calculated column directly in where clause
-		final String SQL = "SELECT * FROM ( "+
-						   "               SELECT name,latitude,longitude,stationcode, " + 
-						   "                     earth_distance( ll_to_earth(latitude,longitude), ll_to_earth(?,?))::int AS calcdist " + 
-						   "               FROM trainstations " +
-						   "               WHERE latitude IS NOT NULL AND longitude IS NOT NULL " +
-						   "       ) AS trainstations2 " +
-					       "ORDER BY calcdist ASC " + 
-					       "LIMIT 4 ";
-		
-		System.out.println(SQL);
-		
-		PreparedStatement stmt = null;
-		ResultSet res = null;
-		
-		StringBuffer buff = new StringBuffer();
-		
-		buff.append("<?xml version=\"1.0\" ?>\n");
-		buff.append("<stations>\n");
-		try
-		{
-			stmt = conn.prepareStatement(SQL);
-			stmt.setDouble(1, latitude);
-			stmt.setDouble(2, longitude);
-			
-			res = stmt.executeQuery();
-			
-			while (res.next()) {
-				buff.append("<station>\n");
-
-				buff.append("<name>").append( res.getString(1) ) .append("</name>\n");
-				buff.append("<latitude>").append( res.getDouble(2) ) .append("</latitude>\n");
-				buff.append("<longitude>").append( res.getDouble(3) ) .append("</longitude>\n");					
-				buff.append("<stationcode>").append( res.getString(4) ) .append("</stationcode>\n");
-				buff.append("<calcdist>").append( res.getInt(5) ) .append("</calcdist>\n");
-				
-				buff.append("</station>\n");				
+
+	Logger logger = Logger.getLogger( LocateStations.class.toString() );
+
+	StationDAO stationDao = new StationDAO();
+
+
+	protected String transformToIntList(String input) {		
+		String strings[] = input.split(",");
+
+		StringBuffer sb = new StringBuffer();
+		sb.append("(");
+		for (int i = 0; i<strings.length; i++) {
+			if (i>0) {
+				sb.append(",");
 			}
-		} finally {
-			if (res != null && !res.isClosed())
-				res.close();
-			if (stmt != null && !stmt.isClosed())
-				stmt.close();
+			sb.append( Integer.parseInt(strings[i])); //by doing the integer conversion we ensure that it really is a integer
 		}
+		sb.append(")");
+		return sb.toString();		
+	}
+
+
+	protected List<StationBean> getStations(HttpServletRequest req) throws SQLException {
+		List<StationBean> stations = null;
+		if (req.getParameter("latitude") != null && req.getParameter("latitude") != null) {
+			double latitude = Double.parseDouble( req.getParameter("latitude") );
+			double longitude = Double.parseDouble( req.getParameter("longitude") );
+			stations = stationDao.getByLocation(latitude, longitude);
+
+		} else if (req.getParameter("name") != null) {
+			String name = req.getParameter("name").trim();
+			stations = stationDao.getByName(name);
+
+		} else if (req.getParameter("list") != null) {
+			String list = transformToIntList( req.getParameter("list"));
+			stations = stationDao.getByList(list);
+		}
+		return stations;
+	}
+
+
+	protected String formatStations(List<StationBean> stations)  {
+
+		StringBuffer buff = new StringBuffer();
+
+		buff.append("<?xml version=\"1.0\" ?>\n");
+		buff.append("<stations>\n");	
+
+
+		for (int i=0; i<stations.size(); i++) {			
+			StationBean station = stations.get(i);
+
+			buff.append("<station>\n");
+
+			buff.append("<id>").append( station.getId() ).append("</id>\n");
+			buff.append("<name>").append( station.getName() ) .append("</name>\n");
+			buff.append("<latitude>").append( station.getLatitude() ) .append("</latitude>\n");
+			buff.append("<longitude>").append( station.getLongitude() ) .append("</longitude>\n");			
+			buff.append("<regional>").append( station.getRegional() != null ) .append("</regional>\n");
+			buff.append("<strain>").append( station.getStrain() != null ) .append("</strain>\n");
+			buff.append("<metro>").append( station.getMetro() != null ).append("</metro>\n");
+			buff.append("<address>").append( station.getAddress() != null ?  station.getAddress() : "").append("</address>");				
+			buff.append("<calcdist>").append( station.getCalcdist() ) .append("</calcdist>\n");
+
+			buff.append("</station>\n");				
+		} 
 		buff.append("</stations>\n");
 		return buff.toString();
 	}
 
+	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		
-		double latitude = Double.parseDouble( request.getParameter("latitude") );
-		double longitude = Double.parseDouble( request.getParameter("longitude") );
-				
-		Connection conn = null;
+
+
 		try {
-			conn = DBConnection.getConnection();
-			
-			String xml = getStations(conn, latitude, longitude);
-			
-			response.setContentType("text/xml");
-			response.getWriter().print(xml);
-			
-			conn.close();
-			conn = null;
-			
-		} catch (Exception e) {
-			throw new ServletException(e);
-		} finally {
-			try {
-				if (conn != null)
-					conn.close();
-			} catch (Throwable t) {}
-		}
+			List<StationBean> stations = getStations(request);
+
+
+			if (stations != null){
+				String xml = formatStations(stations);
+
+				response.setContentType("text/xml");
+				response.getWriter().print(xml);
+			} else {
+				response.sendError(400, "not enough parameters");		
+			}
+
+
+		} catch (Exception e) {				
+			logger.log(Level.SEVERE, "Exception while finding stations", e);
+			response.sendError(500);						
+		} 
 	}
 
 }