--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlStationProvider.java 2010/09/17 16:57:21 1076 +++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlStationProvider.java 2010/09/18 07:16:40 1077 @@ -2,19 +2,14 @@ import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; import org.simpleframework.xml.Serializer; import org.simpleframework.xml.core.Persister; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; + import android.location.Location; import android.util.Log; import dk.thoerup.android.traininfo.common.StationBean; -import dk.thoerup.android.traininfo.common.TimetableBean; import dk.thoerup.traininfo.util.AndroidTimeoutCache; import dk.thoerup.traininfo.util.DownloadUtil; import dk.thoerup.traininfo.util.XmlUtil; @@ -47,15 +42,15 @@ @Override public StationBean 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"); + name = URLEncoder.encode(name, "ISO8859-1"); } catch (Exception e) { - Log.e("lookupStations", "Encoding failed", e); + Log.e("lookupStations", "Encoding failed", e);//if encoding fails use original and hope for the best } + String url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + name; + + Log.i("url", url); return lookupStationsWorker(url); } @@ -98,10 +93,8 @@ StationBean stations = serializer.read(StationBean.class, xml); - return stations; - } catch (Exception e) { Log.e("XmlStationProvider", "lookupStations: ", e); return null;