--- android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2009/09/01 22:18:41	296
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2010/05/18 17:56:43	733
@@ -13,6 +13,10 @@
 
 public class DumpResultSet extends HttpServlet {
 
+    public DumpResultSet() {
+        super();
+    }
+
 
 	private static final long serialVersionUID = 1L;
 
@@ -22,7 +26,10 @@
 		Connection conn = null;
 		Statement stmt = null;
 		ResultSet rs = null;
+		
 		try {
+			int count = 0;
+			
 			conn =  DBConnection.getConnection();
 			stmt = conn.createStatement();
 			
@@ -31,20 +38,27 @@
 			int columns = meta.getColumnCount();
 			
 			sb.append("<h2>").append(sql).append("</h2>");
-			sb.append("<table><tr>");
+			sb.append("<table border=1><tr>");
 			for (int i=1; i<=columns; i++) {
 				sb.append("<th>").append( meta.getColumnName(i)).append("</th>");
 			}
-			sb.append("</tr>");
+			sb.append("</tr>\n\n");
 			while(rs.next())
 			{
+				count++;
+				
 				sb.append("<tr>");
 				for (int i=1; i<=columns; i++) {
-					sb.append("<td>").append(rs.getString(i)).append("</td>");
+					String value = rs.getString(i);
+					if (value != null) {
+						value = value.replace("\n", "<br>");
+					}
+					sb.append("<td>").append( value ).append("</td>");
 				}
-				sb.append("</tr>");
+				sb.append("</tr>\n");
 			}
 			sb.append("</table>");
+			sb.append("Rowcount: ").append(count);
 		} catch (Exception e) { 
 			throw new ServletException(e);
 		} finally {
@@ -67,17 +81,71 @@
 		return sb.toString();
 	}
 	
+	String dumpUpdate(String query) throws ServletException {
+		StringBuilder sb = new StringBuilder();
+
+		Connection conn = null;
+		Statement stmt = null;
+		try {
+			conn =  DBConnection.getConnection();
+			stmt = conn.createStatement();
+			stmt.execute(query);
+			int count = stmt.getUpdateCount();
+			
+			sb.append("<h2>").append(query).append("</h2>");
+			sb.append("Affected rows: ").append(count);
+		} catch (Exception e) { 
+			throw new ServletException(e);
+		} finally {
+			try {
+				if (stmt != null && !stmt.isClosed())
+					stmt.close();
+			} catch (Exception e) {}
+			
+			try {
+				if (conn != null && !conn.isClosed())
+					conn.close();
+			} catch (Exception e) {}
+		}
+		
+		return sb.toString();
+	}
+	
+	
+	
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		String dump = req.getParameter("dump");
 		
-		String res = "invalid dump parameter";
+		String res = null;
 	
-		if (dump.equals("all")) {
-			res = dumpResultset("SELECT * FROM trainstations");
-		} else if (dump.equals("coords")) {
-			res = dumpResultset("SELECT * FROM trainstations WHERE latitude IS NULL OR longitude IS NULL");			
+		if (dump != null) {
+			if (dump.equals("all")) {
+				res = dumpResultset("SELECT * FROM trainstations ORDER BY id");
+			} else if (dump.equals("coords")) {
+				res = dumpResultset("SELECT * FROM trainstations WHERE latitude IS NULL OR longitude IS NULL ORDER BY id");			
+			} else if (dump.equals("duplicate")) {
+				res = dumpResultset("SELECT name,count(*) FROM trainstations GROUP BY name HAVING count(*) > 1"); 
+			} else if (dump.equals("allfull")) {
+				res = dumpResultset("select *, " + 
+						"'<a href=\"http://maps.google.dk/?q=' ||latitude || ',' || longitude || '\">Maps</a>' AS maps, " + 
+						"'<a href=\"http://www.bane.dk/visStation.asp?ArtikelID=4275&W=FJRN&S=' || stationcode_fjrn  || '\">Bane.dk Fjern</a>' as banedk1, " + 
+						"'<a href=\"http://www.bane.dk/visStation.asp?ArtikelID=4275&W=S2&S=' || stationcode_stog  || '\">Bane.dk stog</a>' as banedk2 " + 
+						"FROM trainstations ORDER BY id");
+			} else if (dump.equals("disabled")) {
+				res = dumpResultset("SELECT * FROM trainstations WHERE enabled = false ORDER BY id");
+			} else if (dump.equals("noaddress")) {
+				res = dumpResultset("SELECT * FROM trainstations WHERE address IS NULL or address = '' ");
+			} else if (dump.equals("aliases")) {
+				res = dumpResultset("SELECT * FROM trainstations WHERE aliases IS NOT null");
+			} else if (dump.equals("updatecoords")) {
+				res = dumpUpdate("UPDATE trainstations SET earth_coord = ll_to_earth(latitude,longitude)");
+			}
 		}
+		if (res == null) {
+			res = "<a href=DumpResultSet?dump=all>All</a><br><a href=DumpResultSet?dump=allfull>All with links</a><br><a href=DumpResultSet?dump=coords>Missing coords</a><br><a href=DumpResultSet?dump=duplicate>Duplicate stations</a><br><a href=DumpResultSet?dump=disabled>Disabled stations</a><br><a href=DumpResultSet?dump=noaddress>No address</a><br><a href=DumpResultSet?dump=aliases>Has aliases</a><br><a href=DumpResultSet?dump=updatecoords>update coords</a>";
+		}
+		
 		resp.setContentType("text/html");
 		resp.getWriter().println(res);
 	}