--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlStationProvider.java	2009/10/02 10:39:09	381
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlStationProvider.java	2010/01/26 20:28:13	551
@@ -1,6 +1,7 @@
 package dk.thoerup.traininfo.provider;
 
-import java.net.URI;
+
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,7 +10,6 @@
 import org.w3c.dom.NodeList;
 
 import android.location.Location;
-import android.net.Uri;
 import android.util.Log;
 import dk.thoerup.traininfo.StationBean;
 import dk.thoerup.traininfo.util.DownloadUtil;
@@ -34,13 +34,32 @@
 	}
 	
 	@Override
-	public boolean lookupStations(String name) {		
-		String url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + Uri.encode(name);
+	public boolean lookupStationsByName(String name) {		
+		
+	//	String url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + Uri.encode(name);
+		String url = "";
+		
+		try {
+			url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + URLEncoder.encode(name, "ISO8859-1");	
+		} catch (Exception e) {
+			Log.e("lookupStations", "Encoding failed", e);
+		}
+		
 		Log.i("url", url);
 		return lookupStationsWorker(url);
 	}
 	
 	
+	@Override
+	public boolean lookupStationsByIds(String ids) {
+		String url = "";
+		url = XmlUtil.SERVICE_BASE + "/LocateStations?list=" + ids;
+		
+		Log.i("url", url);
+		return lookupStationsWorker(url);
+	}
+
+
 	public boolean lookupStationsWorker(String url) {
 		boolean success = false;
 
@@ -90,6 +109,18 @@
 					
 					if (nodeName.equals("calcdist"))
 						station.setDistance( (int) Double.parseDouble(content) );
+					
+					if (nodeName.equals("address"))
+						station.setAddress( content );
+					
+					if (nodeName.equals("regional"))
+						station.setRegional( Boolean.parseBoolean(content) );
+					
+					if (nodeName.equals("strain"))
+						station.setSTrain( Boolean.parseBoolean(content) );
+					
+					if (nodeName.equals("metro"))
+						station.setMetro( Boolean.parseBoolean(content) );
 
 				}
 				stations.add(station);