--- android/TrainInfoService/WebContent/version.jsp	2011/04/30 05:43:04	1404
+++ 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 
@@ -27,9 +28,16 @@
 while ( (line=in.readLine()) != null) {
 	if (line.indexOf("traininfo/version") == -1) 
 		continue;
-	String uri = line.split(" ")[7];
-	String tmp = uri.split("=")[1];
-	String version = tmp.split("&") [0];
+	String version = "";
+	String parts[] = line.split(" ");
+
+	if (parts.length >= 8) {		
+		String uri = parts[7];
+		String tmpVer = HttpUtil.decodeUri(uri).get("version");
+		
+		if (tmpVer != null)
+			version = tmpVer;
+	}
 	
 	Integer count = versions.get(version);
 	if (count == null)