--- android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2009/09/02 04:52:57	298
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2009/11/04 11:09:19	497
@@ -28,6 +28,8 @@
 		ResultSet rs = null;
 		
 		try {
+			int count = 0;
+			
 			conn =  DBConnection.getConnection();
 			stmt = conn.createStatement();
 			
@@ -40,16 +42,23 @@
 			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 {
@@ -80,15 +89,25 @@
 	
 		if (dump != null) {
 			if (dump.equals("all")) {
-				res = dumpResultset("SELECT * FROM trainstations");
+				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");			
+				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 = '' ");
 			}
 		}
 		if (res == null) {
-			res = "<a href=DumpResultSet?dump=all>All</a><br><a href=DumpResultSet?dump=coords>Missing coords</a><br><a href=DumpResultSet?dump=duplicate>Duplicate stations</a>";
+			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>";
 		}
 		
 		resp.setContentType("text/html");