--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2009/09/30 06:02:03	364
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlTimetableProvider.java	2009/09/30 09:14:27	365
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -24,7 +25,7 @@
 	@Override
 	public boolean lookupTimetable(String trainID) {
 		boolean success = false;
-		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainID ;
+		String url = XmlUtil.SERVICE_BASE + "/TimetableServlet?train=" + trainID.replace(" ", "%20") ;
 		Log.i("url", url);
 		try {
 			timetables.clear();
@@ -45,7 +46,14 @@
 	
 				TimetableBean timetable = new TimetableBean();
 				
-				NodeList entries = entryNode.getChildNodes();
+				NodeList entries = entryNode.getChildNodes();				
+				
+				if (entryNode.hasAttributes() && entryNode.getAttributes().getNamedItem("current") != null) {					
+					timetable.setCurrent( Boolean.parseBoolean(entryNode.getAttributes().getNamedItem("current").getNodeValue()));
+				} else {
+					timetable.setCurrent(false);
+				}
+				
 				for (int j=0; j<entries.getLength(); j++) {	
 					Node current = entries.item(j);
 										
@@ -64,8 +72,8 @@
 					if (nodeName.equals("departure"))
 						timetable.setDeparture( content );
 					
-					if (nodeName.equals("current"))
-						timetable.setCurrent( Boolean.parseBoolean(content) );
+					/*if (nodeName.equals("current"))
+						timetable.setCurrent( Boolean.parseBoolean(content) );*/
 
 				}
 				timetables.add(timetable);