--- android/TrainInfoService/src/dk/thoerup/traininfoservice/DumpResultSet.java	2010/07/05 09:48:06	958
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/db/DumpResultSet.java	2011/04/04 10:56:44	1255
@@ -1,4 +1,4 @@
-package dk.thoerup.traininfoservice;
+package dk.thoerup.traininfoservice.db;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -13,6 +13,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+
 @WebServlet(urlPatterns={"/DumpResultSet"})
 public class DumpResultSet extends HttpServlet {
 
@@ -143,15 +144,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 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 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");
-			}
+			} 
 		}
 		if (res == null) {
 			res = "<a href=DumpResultSet?dump=all>All</a><br>" +
@@ -161,9 +154,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");