--- android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2010/06/10 07:25:47	815
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2010/07/07 09:12:32	961
@@ -5,12 +5,15 @@
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.Statement;
+import java.util.Date;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+@WebServlet(urlPatterns={"/DumpResultSet"})
 public class DumpResultSet extends HttpServlet {
 
     public DumpResultSet() {
@@ -58,7 +61,8 @@
 				sb.append("</tr>\n");
 			}
 			sb.append("</table>");
-			sb.append("Rowcount: ").append(count);
+			sb.append("Rowcount: ").append(count).append("<br>\n");
+			sb.append("Generated: ").append(new Date()).append("<br>\n");
 		} catch (Exception e) { 
 			throw new ServletException(e);
 		} finally {
@@ -77,7 +81,6 @@
 					conn.close();
 			} catch (Exception e) {}
 		}
-		
 		return sb.toString();
 	}
 	
@@ -140,14 +143,7 @@
 				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)");
-			} else if (dump.equals("trainstatistics")) {
-				res = dumpResultset("SELECT * FROM trainstatistics ORDER BY statisticsdate DESC");
-			} else if (dump.equals("trainstatistics_avg")) {
-				res = dumpResultset("SELECT  round(avg(location),1) as location, round(avg(name),1) as name, round(avg(favorites),1) as favorites, " +
-						"round(avg(departure),1) as departure, round(avg(depcache),1) as depcache, round(avg(deperror),1) as deperror, " +
-						"round(avg(timetable),1) as timetable, round(avg(timecache),1) as timecache, round(avg(timeerror),1) as timeerror " +
-						"FROM trainstatistics");
-			}
+			} 
 		}
 		if (res == null) {
 			res = "<a href=DumpResultSet?dump=all>All</a><br>" +
@@ -157,9 +153,7 @@
 					"<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><br>" +
-					"<a href=DumpResultSet?dump=trainstatistics>statistics</a><br>" +
-					"<a href=DumpResultSet?dump=trainstatistics_avg>stats_avg</a><br>";
+					"<a href=DumpResultSet?dump=updatecoords>update coords</a><br>";
 		}
 		
 		resp.setContentType("text/html");