--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/09/08 12:49:22	1036
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2011/04/04 10:56:44	1255
@@ -4,8 +4,6 @@
 
 import java.net.URL;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -14,15 +12,17 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import dk.thoerup.android.traininfo.common.TimetableBean;
+import dk.thoerup.android.traininfo.common.TimetableEntry;
 import dk.thoerup.circuitbreaker.CircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 public class TimetableFetcher {
 
 		
-	Map<String, List<TimetableBean>> cache; 
+	Map<String, TimetableBean> cache; 
 	Map<String, Integer> stationCache;
 
 	StationDAO stationDao = new StationDAO();
@@ -37,14 +37,14 @@
 		useAzureSite = azureSite;
 		this.replyTimeout = replyTimeout;
 		
-		cache = new TimeoutMap<String,List<TimetableBean>>(cacheTimeout);
+		cache = new TimeoutMap<String,TimetableBean>(cacheTimeout);
 		stationCache = new TimeoutMap<String,Integer>( 3*60*60*1000 );
 	}
 	
 	
-	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Exception {
+	TimetableBean cachedLookupTimetable(String trainID, String type) throws Exception {
 		String key = trainID+type;
-		List<TimetableBean> list = cache.get(key);
+		TimetableBean list = cache.get(key);
 		
 		if (list == null) {
 			list = lookupTimetable(trainID,type);
@@ -56,7 +56,7 @@
 		return list;
 	}
 	
-	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {
+	TimetableBean lookupTimetable(String trainID, String type) throws Exception {
 		if (useAzureSite == true ){
 			return lookupTimetableAzureSite(trainID, type);
 			
@@ -81,12 +81,12 @@
 		return id;
 	}
 
-	List<TimetableBean> lookupTimetableAzureSite(String trainID, String type) throws Exception {		
-		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
+	TimetableBean lookupTimetableAzureSite(String trainID, String type) throws Exception {		
+		TimetableBean timetableBean = new TimetableBean();
 		
-		//String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
-		String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID;			
 
+		String url = "http://trafikinfo.bane.dk/TrafikInformation/Ruteplan/" + trainID;			
+		logger.fine("URL:" + url);
 	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
@@ -117,43 +117,43 @@
 	    			continue;
 	    		}
 	    		
-	    		TimetableBean bean = new TimetableBean();
+	    		TimetableEntry entry = new TimetableEntry();
 	    		
 	    		String station = fields.get(0).text() ;
 	    		if (station.equals("København"))
 	    			station = "København H"; //correct inconsistency in naming
 	    		
-	    		bean.setStation( station );
-	    		bean.setArrival( fields.get(1).text() );
-	    		bean.setDeparture( fields.get(2).text() );
+	    		entry.setStation( station );
+	    		entry.setArrival( fields.get(1).text() );
+	    		entry.setDeparture( fields.get(2).text() );
 	    		
 	    		boolean cancelled = fields.get(3).text().equalsIgnoreCase("aflyst");
-	    		bean.setCancelled(cancelled);
+	    		entry.setCancelled(cancelled);
 	    		
 	    		if (currentStation == true && currentStationSaved == false ) {
-	    			bean.setCurrent(currentStation);
+	    			entry.setCurrent(currentStation);
 	    			currentStationSaved = true;
 	    		}
 	    		
-	    		bean.setStationId( getStationId( station ));
+	    		entry.setStationId( getStationId( station ));
 	    		
-	    		timetableList.add(bean);
+	    		timetableBean.entries.add(entry);
 	    	}
 	    	
 	    	//TODO: There is an off-by-one error in this cancelled parser thingie
 	    	final String cancelledString = "Aflyst";
-	    	for (int i=0;i<timetableList.size(); i++) { //handle cancelled labels
-	    		final int lastIdx = (timetableList.size() - 1);
+	    	for (int i=0;i<timetableBean.entries.size(); i++) { //handle cancelled labels
+	    		final int lastIdx = (timetableBean.entries.size() - 1);
 	    		
-	    		TimetableBean current = timetableList.get(i);
+	    		TimetableEntry current = timetableBean.entries.get(i);
 	    		if (current.isCancelled()) {
 		    		if (i == 0) {
 		    			current.setDeparture(cancelledString);
 		    		} else if (i == lastIdx) {
 		    			current.setArrival(cancelledString);
 		    		} else if (i>0 && i<lastIdx) {
-		    			TimetableBean next = timetableList.get(i+1);
-		    			TimetableBean prev = timetableList.get(i-1);
+		    			TimetableEntry next = timetableBean.entries.get(i+1);
+		    			TimetableEntry prev = timetableBean.entries.get(i-1);
 		    			
 		    			if (next.isCancelled())
 		    				current.setDeparture(cancelledString);
@@ -168,14 +168,14 @@
 	    }
 	    
 		
-		return timetableList;
+		return timetableBean;
 	}
 
-	List<TimetableBean> lookupTimetableWwwSite(String trainID, String type) throws Exception {		
-		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
+	TimetableBean lookupTimetableWwwSite(String trainID, String type) throws Exception {		
+		TimetableBean timetableBean = new TimetableBean();
 		
 		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
-
+		logger.fine("URL:" + url);
 
 	    
 	    JsoupInvocation wrapper = new JsoupInvocation( new URL(url) , replyTimeout);
@@ -207,25 +207,28 @@
 	    			continue;
 	    		}
 	    		
-	    		TimetableBean bean = new TimetableBean();
+	    		TimetableEntry entry = new TimetableEntry();
 	    		
-	    		String station = fields.get(0).text() ;
+	    		String station = DepartureFetcher.cleanText( fields.get(0).text() ) ;
 	    		if (station.equals("København"))
 	    			station = "København H"; //correct inconsistency in naming
 	    		
-	    		bean.setStation( station );
-	    		bean.setArrival( fields.get(1).text() );
-	    		bean.setDeparture( fields.get(2).text() );
+	    		String arrival = DepartureFetcher.cleanText( fields.get(1).text() );
+	    		String departure = DepartureFetcher.cleanText( fields.get(2).text() );
+	    		
+	    		entry.setStation( station );
+	    		entry.setArrival( arrival );
+	    		entry.setDeparture( departure );
     		
 	    		
 	    		if (currentStation == true && currentStationSaved == false ) {
-	    			bean.setCurrent(currentStation);
+	    			entry.setCurrent(currentStation);
 	    			currentStationSaved = true;
 	    		}
 	    		
-	    		bean.setStationId( getStationId( station ));
+	    		entry.setStationId( getStationId( station ));
 	    		
-	    		timetableList.add(bean);
+	    		timetableBean.entries.add(entry);
 	    	}	    	
 	    	
 	    } else {
@@ -233,7 +236,7 @@
 	    }
 	    
 		
-		return timetableList;
+		return timetableBean;
 	}	
 	
 }