--- android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2010/06/09 21:04:54	813
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2010/07/05 09:48:06	958
@@ -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();
 	}
 	
@@ -141,9 +144,10 @@
 			} 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");
+				res = dumpResultset("SELECT statisticsdate, location+name+favorites AS station, location,name,favorites,departure,depcache,deperror,timetable,timecache,timeerror " +
+						"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, " +
+				res = dumpResultset("SELECT count(*) AS count, round(avg(location+name+favorites),1) AS station, 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");