--- android/TrainInfoService/WebContent/version.jsp	2011/05/02 08:08:56	1405
+++ android/TrainInfoService/WebContent/version.jsp	2011/09/23 10:07:22	1600
@@ -1,5 +1,6 @@
 <%@ page import="java.io.*" %>
 <%@ page import="java.util.*" %>
+<%@ page import="dk.thoerup.genericjavautils.HttpUtil" %>
 <%
 /*
 cat bin/traininfo-version.sh 
@@ -22,28 +23,49 @@
 BufferedReader in = new BufferedReader( new InputStreamReader(input) );
 
 Map<String,Integer> versions = new TreeMap<String,Integer>();
+Map<String,Integer> phones = new TreeMap<String,Integer>();
+Map<String,Integer> androids = new TreeMap<String,Integer>();
 
 String line;
 while ( (line=in.readLine()) != null) {
 	if (line.indexOf("traininfo/version") == -1) 
 		continue;
 	String version = "";
+	String phone = "";
+	String android = "";
+
 	String parts[] = line.split(" ");
 
-	if (parts.length >= 8) {
+	if (parts.length >= 8) {		
 		String uri = parts[7];
-		if (uri.indexOf("=") != -1) { 
-			String tmp = uri.split("=")[1];
-			if (tmp.indexOf("&") != -1) {
-				version = tmp.split("&") [0];
-			}
-		}
+		Map<String,String> params = HttpUtil.decodeUri(uri);
+
+		String tmpVer = params.get("version");
+		String tmpPhone = params.get("phone");
+		String tmpAndroid = params.get("android");
+		
+		if (tmpVer != null)
+			version = tmpVer;		
+		if (tmpPhone != null)
+			phone = tmpPhone;
+		if (tmpAndroid != null)
+			android = tmpAndroid;	
 	}
 	
 	Integer count = versions.get(version);
 	if (count == null)
 		count = 0;
 	versions.put(version, count+1);
+
+	count = phones.get(phone);
+	if (count == null)
+		count = 0;
+	phones.put(phone, count+1);
+		
+	count = androids.get(android);
+	if (count == null)
+		count = 0;
+	androids.put(android, count+1);
 		
 }
 
@@ -62,6 +84,30 @@
 	%>
 	<tr><td><%=key%></td><td align='right'><%= val %></td></tr>
 	<%
+}
+%>
+</table>
+
+<h2>Phones</h2>
+<table border='0'>
+<%
+for (String key : phones.keySet()) {
+	int val = phones.get(key);
+	%>
+	<tr><td><%=key%></td><td align='right'><%= val %></td></tr>
+	<%
+}
+%>
+</table>
+
+<h2>Android ver.</h2>
+<table border='0'>
+<%
+for (String key : androids.keySet()) {
+	int val = phones.get(key);
+	%>
+	<tr><td><%=key%></td><td align='right'><%= val %></td></tr>
+	<%
 }
 %>
 </table>