--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlDepartureProvider.java	2009/08/08 20:09:47	238
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlDepartureProvider.java	2009/08/27 08:34:50	283
@@ -30,7 +30,7 @@
 		departures.clear();
 		try
 		{	String url = "http://t-hoerup.dk/tog/xml_display.php?stationname="+station;
-			String doc =  DownloadUtil.getContent(url, 30000, "ISO-8859-1");
+			String doc =  DownloadUtil.getContentString(url, 45000, "ISO-8859-1");
 			
 			InputSource source = new InputSource( new StringReader(doc));
 			
@@ -75,21 +75,21 @@
 		if (name.equals("train")) {
 			departures.add( tempDeparture );
 		} else if (name.equals("time")) {
-			tempDeparture.setTime(builder.toString());
+			tempDeparture.setTime(builder.toString().trim());
 		} else if (name.equals("updated")) {
-			tempDeparture.setLastUpdate(builder.toString());
+			tempDeparture.setLastUpdate(builder.toString().trim());
 		} else if (name.equals("trainnumber")) {
-			tempDeparture.setTrainNumber(builder.toString());
+			tempDeparture.setTrainNumber(builder.toString().trim());
 		} else if (name.equals("destination")) {
-			tempDeparture.setDestination(builder.toString());
+			tempDeparture.setDestination(builder.toString().trim());
 		} else if (name.equals("origin")) {
-			tempDeparture.setOrigin(builder.toString());
+			tempDeparture.setOrigin(builder.toString().trim());
 		} else if (name.equals("location")) {
-			tempDeparture.setLocation(builder.toString());
+			tempDeparture.setLocation(builder.toString().trim());
 		} else if (name.equals("status")) {
-			tempDeparture.setStatus(builder.toString());
+			tempDeparture.setStatus(builder.toString().trim());
 		} else if (name.equals("note")) {
-			tempDeparture.setNote(builder.toString());
+			tempDeparture.setNote(builder.toString().trim());
 		} 
 	}
 }