--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2011/05/02 16:08:01	1416
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2011/05/02 16:21:37	1417
@@ -67,14 +67,13 @@
 		}
 	}
 	
-	StationEntry getStationId(String name) {
+	StationEntry getStation(String name) {
 		StationEntry station = stationCache.get(name);
 		
 		if (station == null) {
 			try {
-				StationBean bean = stationDao.getByName(name);
-				if (bean.entries.size() == 1) {
-					station = bean.entries.get(0);
+				station = stationDao.getSimpleByName(name);
+				if (station != null) {
 					stationCache.put(name,station);
 				}
 			} catch (SQLException e) {
@@ -144,7 +143,7 @@
 	    			currentStationSaved = true;
 	    		}
 	    		
-	    		entry.setStationEntry( getStationId( station ));
+	    		entry.setStationEntry( getStation( station ));
 	    		
 	    		timetableBean.entries.add(entry);
 	    	}
@@ -220,7 +219,7 @@
 	    	entry.setDeparture( departure );
 
 
-	    	entry.setStationEntry( getStationId( station ));
+	    	entry.setStationEntry( getStation( station ));
 
 	    	timetableBean.entries.add(entry);
 	    }	    	
@@ -286,7 +285,7 @@
 	    			currentStationSaved = true;
 	    		}
 	    		
-	    		entry.setStationEntry( getStationId( station ));
+	    		entry.setStationEntry( getStation( station ));
 	    		
 	    		timetableBean.entries.add(entry);
 	    	}