--- android/TrainInfoService/WebContent/version.jsp	2011/05/02 08:08:56	1405
+++ android/TrainInfoService/WebContent/version.jsp	2011/05/02 15:14:25	1414
@@ -1,5 +1,6 @@
 <%@ page import="java.io.*" %>
 <%@ page import="java.util.*" %>
+<%@ page import="dk.thoerup.genericjavautils.HttpUtil" %>
 <%
 /*
 cat bin/traininfo-version.sh 
@@ -30,14 +31,12 @@
 	String version = "";
 	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];
-			}
-		}
+		String tmpVer = HttpUtil.decodeUri(uri).get("version");
+		
+		if (tmpVer != null)
+			version = tmpVer;
 	}
 	
 	Integer count = versions.get(version);