--- android/TrainInfoService/WebContent/version.jsp	2011/09/22 15:21:15	1599
+++ android/TrainInfoService/WebContent/version.jsp	2011/09/23 10:07:22	1600
@@ -24,6 +24,7 @@
 
 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) {
@@ -31,20 +32,24 @@
 		continue;
 	String version = "";
 	String phone = "";
+	String android = "";
+
 	String parts[] = line.split(" ");
 
 	if (parts.length >= 8) {		
 		String uri = parts[7];
 		Map<String,String> params = HttpUtil.decodeUri(uri);
+
 		String tmpVer = params.get("version");
-		
-		if (tmpVer != null)
-			version = tmpVer;
-		
 		String tmpPhone = params.get("phone");
 		String tmpAndroid = params.get("android");
-		if (tmpPhone != null && tmpAndroid != null)
-			phone = tmpPhone + " " + tmpAndroid;
+		
+		if (tmpVer != null)
+			version = tmpVer;		
+		if (tmpPhone != null)
+			phone = tmpPhone;
+		if (tmpAndroid != null)
+			android = tmpAndroid;	
 	}
 	
 	Integer count = versions.get(version);
@@ -57,6 +62,11 @@
 		count = 0;
 	phones.put(phone, count+1);
 		
+	count = androids.get(android);
+	if (count == null)
+		count = 0;
+	androids.put(android, count+1);
+		
 }
 
 %>
@@ -78,7 +88,7 @@
 %>
 </table>
 
-<h2>Phones / Android ver.</h2>
+<h2>Phones</h2>
 <table border='0'>
 <%
 for (String key : phones.keySet()) {
@@ -89,6 +99,19 @@
 }
 %>
 </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>
+
 </body>
 </html>