--- android/TrainInfoService/WebContent/statistics.jsp	2010/05/05 20:11:03	711
+++ android/TrainInfoService/WebContent/statistics.jsp	2010/05/06 12:21:57	712
@@ -3,7 +3,8 @@
 <%@ page import="java.util.Date" %>
 <%@ page import="dk.thoerup.traininfoservice.Statistics" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+
+<%@page import="java.text.NumberFormat"%><html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>TrainInfoService statistics</title>
@@ -19,6 +20,9 @@
 <%
 Statistics stats = Statistics.getInstance();
 double days = stats.getElapsedDays();
+NumberFormat form = NumberFormat.getNumberInstance();
+form.setMaximumFractionDigits(1);
+form.setMinimumFractionDigits(1);
 
 %>
 
@@ -40,49 +44,49 @@
 <br>
 <table border="1" cellspacing="0">
 	<tr>
-		<th>Label</th>
-		<th>Total</th>
-		<th>Avg pr day</th>
+		<th>&nbsp;Label&nbsp;</th>
+		<th>&nbsp;Total&nbsp;</th>
+		<th>&nbsp;Avg/day&nbsp;</th>
 	</tr>
 	<tr>
 		<td class="left">Station Lookups</td>
 		<td><%= stats.getStationTotals() %></td>
-		<td><%= stats.getStationTotals()/days %></td>
+		<td><%= form.format(stats.getStationTotals()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">--by Location</td>
-		<td><%=stats.getStationLookupsLocation() %></td>
-		<td><%=stats.getStationLookupsLocation()/days %></td>
+		<td><%= stats.getStationLookupsLocation() %></td>
+		<td><%= form.format(stats.getStationLookupsLocation()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">--by Name</td>
-		<td><%=stats.getStationLookupsName() %></td>
-		<td><%=stats.getStationLookupsName()/days %></td>
+		<td><%= stats.getStationLookupsName() %></td>
+		<td><%= form.format(stats.getStationLookupsName()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">--by Favorites</td>
-		<td><%=stats.getStationLookupsFavorites() %></td>
-		<td><%=stats.getStationLookupsFavorites()/days %></td>
+		<td><%= stats.getStationLookupsFavorites() %></td>
+		<td><%= form.format(stats.getStationLookupsFavorites()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">Departure Lookups</td>
-		<td><%=stats.getDepartureLookups() %></td>
-		<td><%=stats.getDepartureLookups()/days %></td>
+		<td><%= stats.getDepartureLookups() %></td>
+		<td><%= form.format(stats.getDepartureLookups()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">--cache hits</td>
-		<td><%=stats.getDepartureCacheHits() %></td>
-		<td><%=stats.getDepartureCacheHits()/days %></td>
+		<td><%= stats.getDepartureCacheHits() %></td>
+		<td><%= form.format(stats.getDepartureCacheHits()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">Timetable Lookups</td>
-		<td><%=stats.getTimetableLookups() %></td>
-		<td><%=stats.getTimetableLookups()/days %></td>
+		<td><%= stats.getTimetableLookups() %></td>
+		<td><%= form.format(stats.getTimetableLookups()/days) %></td>
 	</tr>
 	<tr>
 		<td class="left">--cache hits</td>
-		<td><%=stats.getTimetableCacheHits() %></td>
-		<td><%=stats.getTimetableCacheHits()/days %></td>
+		<td><%= stats.getTimetableCacheHits() %></td>
+		<td><%= form.format(stats.getTimetableCacheHits()/days) %></td>
 	</tr>
 </table>
 

Label	Total	Avg pr day	Label	Total
Station Lookups	<%= stats.getStationTotals() %>	<%= stats.getStationTotals()/days %>	<%= form.format(stats.getStationTotals()/days) %>
--by Location	<%=stats.getStationLookupsLocation() %>	<%=stats.getStationLookupsLocation()/days %>	<%= stats.getStationLookupsLocation() %>	<%= form.format(stats.getStationLookupsLocation()/days) %>
--by Name	<%=stats.getStationLookupsName() %>	<%=stats.getStationLookupsName()/days %>	<%= stats.getStationLookupsName() %>	<%= form.format(stats.getStationLookupsName()/days) %>
--by Favorites	<%=stats.getStationLookupsFavorites() %>	<%=stats.getStationLookupsFavorites()/days %>	<%= stats.getStationLookupsFavorites() %>	<%= form.format(stats.getStationLookupsFavorites()/days) %>
Departure Lookups	<%=stats.getDepartureLookups() %>	<%=stats.getDepartureLookups()/days %>	<%= stats.getDepartureLookups() %>	<%= form.format(stats.getDepartureLookups()/days) %>
--cache hits	<%=stats.getDepartureCacheHits() %>	<%=stats.getDepartureCacheHits()/days %>	<%= stats.getDepartureCacheHits() %>	<%= form.format(stats.getDepartureCacheHits()/days) %>
Timetable Lookups	<%=stats.getTimetableLookups() %>	<%=stats.getTimetableLookups()/days %>	<%= stats.getTimetableLookups() %>	<%= form.format(stats.getTimetableLookups()/days) %>
--cache hits	<%=stats.getTimetableCacheHits() %>	<%=stats.getTimetableCacheHits()/days %>	<%= stats.getTimetableCacheHits() %>	<%= form.format(stats.getTimetableCacheHits()/days) %>