--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/06/11 17:16:06	837
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/07/09 21:23:48	970
@@ -76,7 +76,7 @@
 		
 		if (id == null) {
 			try {
-				id = stationDao.getBySpecificName(name);
+				id = stationDao.getIdByName(name);
 				stationCache.put(name, id);
 			} catch (SQLException e) {
 				logger.log(Level.SEVERE, "getStationId failed", e);
@@ -90,8 +90,8 @@
 	List<TimetableBean> lookupTimetableRealSite(String trainID, String type) throws Exception {		
 		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
 		
-		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
-				
+		//String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
+		String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID;			
 
 	    final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
 	    webClient.setTimeout(2500);
@@ -100,7 +100,7 @@
 	    webClient.setCssEnabled(false);
 	    
 	    
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, url);
+	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, url);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);